Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorStephen Gran <steve@lobefin.net>
Tue, 15 Apr 2014 15:54:52 +0000 (16:54 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 15 Apr 2014 15:54:52 +0000 (16:54 +0100)

Trivial merge