Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorStephen Gran <steve@lobefin.net>
Mon, 17 Oct 2011 19:34:05 +0000 (20:34 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 17 Oct 2011 19:34:05 +0000 (20:34 +0100)
1  2 
config/nagios-master.cfg

Simple merge