Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 20 Feb 2012 08:33:15 +0000 (09:33 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 20 Feb 2012 08:33:15 +0000 (09:33 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  gombert is now doing mail

1  2 
config/nagios-master.cfg

Simple merge