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)
commit2260f2817fcdb4c095176da23ca4d52868751c56
treed04b4e84ac8e80eb1584e1df9592d4323dbefebe
parent430d96ab3c6d2725a2fcf06d5d86adac41620bef
parent0563d875ea7b762563758fe046ffe52335709b9c
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  no spamd on bellini
  bellini on heavy-exim
config/nagios-master.cfg