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)
commit80bda3ef9cecb26888445f5e63fd471bf637bcb1
treeda489de577606714fffb15248d4a9db99f11cee6
parent6c8a11882ba2e70cf33e56c1f89e1e73c7dbd7db
parentb58f332f08c44ab7d6582684b718b603565b7c61
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
config/nagios-master.cfg