Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorStephen Gran <steve@lobefin.net>
Tue, 11 Oct 2011 19:21:02 +0000 (20:21 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 11 Oct 2011 19:21:02 +0000 (20:21 +0100)

Trivial merge