Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 12 Aug 2010 12:39:29 +0000 (14:39 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 12 Aug 2010 12:39:29 +0000 (14:39 +0200)
1  2 
config/nagios-master.cfg

Simple merge