Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 23 Feb 2011 16:14:29 +0000 (17:14 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 23 Feb 2011 16:14:29 +0000 (17:14 +0100)
commitd515235deb66e443336189c633ff31d958f5cbda
treecc27c1e2201b43a1151a84d5a2c835adbe08c0ae
parent3f002c254518883b908ba76ad2929623a640aca2
parent887e9eb08b47ef346ba2208a6efb4947e7a4d4e3
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  piatti to squeeze
  I can't believe that has ever worked
config/nagios-master.cfg