Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 30 Jul 2010 17:06:07 +0000 (19:06 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 30 Jul 2010 17:06:07 +0000 (19:06 +0200)
1  2 
config/nagios-master.cfg

Simple merge