Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Tue, 3 Nov 2009 09:47:41 +0000 (10:47 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 3 Nov 2009 09:47:41 +0000 (10:47 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  byrd now in heavy-exim

1  2 
config/nagios-master.cfg

Simple merge