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)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  luca updated his email address
  lindeberg to squeeze
  duarte to squeeze

1  2 
config/nagios-master.cfg

Simple merge