From: David Schweikert <david@schweikert.ch>
Date: Wed, 21 Oct 2015 19:01:44 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18df5bc5394f8cc42f60469b08ee600d58480d89;p=fping.git

Merge branch 'develop'
---

18df5bc5394f8cc42f60469b08ee600d58480d89