From: David Schweikert <david@schweikert.ch>
Date: Sun, 23 Apr 2017 15:42:53 +0000 (+0200)
Subject: merge develop
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3596aa3be63c904b6958803c36a8d76597d62332;p=fping.git

merge develop
---

3596aa3be63c904b6958803c36a8d76597d62332