Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 15:36:56 +0000 (17:36 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 15:36:56 +0000 (17:36 +0200)
commita52f84987b94b456f319f0e11060f56b5ba6b84f
treed8485fb3f9d458c136d5e7020d88889cd96b2d1d
parent7cd1a0ab18444bc05f872c1d8779c86fc3923cb4
parent5c9e4d46059f366266fb00332918b27bf5de6d56
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
config/nagios-master.cfg