Merge remote-tracking branch 'github/pr/20'
authorFlorian Forster <ff@octo.it>
Mon, 8 May 2017 14:23:52 +0000 (16:23 +0200)
committerFlorian Forster <ff@octo.it>
Mon, 8 May 2017 14:23:52 +0000 (16:23 +0200)
1  2 
src/oping.c

diff --cc src/oping.c
Simple merge