Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 14 Mar 2011 16:29:15 +0000 (17:29 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 14 Mar 2011 16:29:15 +0000 (17:29 +0100)
commit6fdbb2f90e6a9a8548dfef9aeb80aec3c6c9601b
tree6243b0d06735af000ebf8e33c6b49dbc3465f136
parentf0084cf9e5ab0b8bb060fc9315acdc3886a80ad2
parent1f4c8a27566df24bdc65d8a83334a4a89195ad0a
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  luca updated his email address
  lindeberg to squeeze
  duarte to squeeze
config/nagios-master.cfg