]> git.german-service-network.de Git - fping.git/commitdiff
Merge branch 'develop' 3.15
authorDavid Schweikert <[email protected]>
Wed, 11 Jan 2017 08:51:45 +0000 (09:51 +0100)
committerDavid Schweikert <[email protected]>
Wed, 11 Jan 2017 08:51:45 +0000 (09:51 +0100)

Trivial merge