Merge branch 'pr/6'
authorFlorian Forster <ff@octo.it>
Thu, 18 Aug 2016 04:58:53 +0000 (06:58 +0200)
committerFlorian Forster <ff@octo.it>
Thu, 18 Aug 2016 04:58:53 +0000 (06:58 +0200)
1  2 
src/oping.c

diff --cc src/oping.c
Simple merge