]> git.gsnw.org Git - fping.git/commitdiff
Merge branch 'develop'
authorDavid Schweikert <david@schweikert.ch>
Wed, 11 Jan 2017 08:51:45 +0000 (09:51 +0100)
committerDavid Schweikert <david@schweikert.ch>
Wed, 11 Jan 2017 08:51:45 +0000 (09:51 +0100)

Trivial merge