Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 9 Oct 2009 07:27:59 +0000 (09:27 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 9 Oct 2009 07:27:59 +0000 (09:27 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  no spamd on bellini
  bellini on heavy-exim

1  2 
config/nagios-master.cfg

Simple merge