From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Jan 2015 21:44:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'ummeegge/fping'
X-Git-Tag: v2.17-core87~34
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e2e0f6991b6432f7dbdd2b41468e949acca3bbe6

Merge remote-tracking branch 'ummeegge/fping'
---

e2e0f6991b6432f7dbdd2b41468e949acca3bbe6