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)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  piatti to squeeze
  I can't believe that has ever worked

1  2 
config/nagios-master.cfg

Simple merge