Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorStephen Gran <steve@lobefin.net>
Sun, 30 Dec 2012 09:46:16 +0000 (09:46 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 30 Dec 2012 09:46:16 +0000 (09:46 +0000)

Trivial merge