Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorStephen Gran <steve@lobefin.net>
Mon, 27 Aug 2012 20:36:50 +0000 (21:36 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 27 Aug 2012 20:36:50 +0000 (21:36 +0100)

Trivial merge