Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 15 Nov 2011 11:26:14 +0000 (12:26 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 15 Nov 2011 11:26:14 +0000 (12:26 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  put klecker into incomingmailrelayed hostgroup

1  2 
config/nagios-master.cfg

Simple merge