Merge branch 'master' of git+ssh://db.debian.org/srv/db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 6 Jan 2010 17:32:57 +0000 (18:32 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 6 Jan 2010 17:32:57 +0000 (18:32 +0100)
1  2 
config/nagios-master.cfg

Simple merge