]> git.german-service-network.de Git - fping.git/commitdiff
Merge branch 'develop' 3.13
authorDavid Schweikert <[email protected]>
Wed, 21 Oct 2015 19:01:44 +0000 (21:01 +0200)
committerDavid Schweikert <[email protected]>
Wed, 21 Oct 2015 19:01:44 +0000 (21:01 +0200)

Trivial merge