From: Ryan C. Underwood <nemesis@icequake.net>
Date: Fri, 22 May 2015 19:33:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into deadcode
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625793935e85b4c58dd0812c56921122caf61aa6;p=fping.git

Merge remote-tracking branch 'upstream/develop' into deadcode
---

625793935e85b4c58dd0812c56921122caf61aa6