From: David Schweikert <dws@open.ch>
Date: Wed, 14 Oct 2015 19:45:50 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8694f1f89145f865506a885d796d303ec3857bb8;p=fping.git

Merge branch 'develop'
---

8694f1f89145f865506a885d796d303ec3857bb8