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)
commit98e5496df960481bb0b82d3aad0d314a80cd1fb4
tree2c1be4af913401e29b8b6aa042201c7156927e3b
parente81705892bfdb242d5cb4cbc088243a190fdd319
parent73023766bd955e2821104646c3a57d48cf209596
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  gombert is now doing mail
config/nagios-master.cfg