Merge pull request #72 from derobert/develop

author David Schweikert <[email protected]>

Mon, 25 May 2015 13:51:02 +0000 (15:51 +0200)

committer David Schweikert <[email protected]>

Mon, 25 May 2015 13:51:02 +0000 (15:51 +0200)
author David Schweikert <[email protected]>
Mon, 25 May 2015 13:51:02 +0000 (15:51 +0200)
committer David Schweikert <[email protected]>
Mon, 25 May 2015 13:51:02 +0000 (15:51 +0200)
diff --cc doc/fping.pod
Simple merge
diff --cc src/fping.c
Simple merge
author	David Schweikert <[email protected]>
	Mon, 25 May 2015 13:51:02 +0000 (15:51 +0200)
committer	David Schweikert <[email protected]>
	Mon, 25 May 2015 13:51:02 +0000 (15:51 +0200)
		1	2
doc/fping.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/fping.c	patch \|	diff1 \|	diff2 \|	blob \| history