Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 4 May 2010 11:14:42 +0000 (13:14 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 4 May 2010 11:14:42 +0000 (13:14 +0200)
1  2 
config/nagios-master.cfg

Simple merge