Merge branch 'bp/exit'
authorFlorian Forster <ff@octo.it>
Thu, 25 Sep 2014 00:10:54 +0000 (17:10 -0700)
committerFlorian Forster <ff@octo.it>
Thu, 25 Sep 2014 00:10:54 +0000 (17:10 -0700)
commit8557f59b71eb64324dcbb0e470bad9ca5958b2f0
tree4ace31eaec5e8ce25ee3e07ec657c56669b05ab4
parent4710e5477bfa3902b5f5600475ea21c44fabf446
parent441f2f6f137275321d6bb3d8bfb35f414c580ab6
Merge branch 'bp/exit'

Conflicts:
src/mans/oping.pod
src/oping.c
src/mans/oping.pod
src/oping.c