]> git.gsnw.org Git - fping.git/commitdiff
Merge branch 'develop'
authorDavid Schweikert <david@schweikert.ch>
Wed, 21 Oct 2015 19:01:44 +0000 (21:01 +0200)
committerDavid Schweikert <david@schweikert.ch>
Wed, 21 Oct 2015 19:01:44 +0000 (21:01 +0200)

Trivial merge