]> git.gsnw.org Git - fping.git/commitdiff
Merge branch 'jgerbeck-develop' into develop
authorDavid Schweikert <david@schweikert.ch>
Thu, 29 Sep 2016 08:14:54 +0000 (10:14 +0200)
committerDavid Schweikert <david@schweikert.ch>
Thu, 29 Sep 2016 08:14:54 +0000 (10:14 +0200)

Trivial merge