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)
commit07f46cdc9d2a6eedbd968204908c585940bb7d2e
tree79313e9513f0f126e36e2c641165796973a20cf3
parent9f9893610a5b95edc903d03a1c76ce0c9674f996
parent2d98a198b5966ef2f61e7a8d0392f29e1e97dfd8
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
config/nagios-master.cfg