Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Tue, 2 Nov 2010 08:33:40 +0000 (09:33 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 2 Nov 2010 08:33:40 +0000 (09:33 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  widor now has bind9 Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  exclude ries on the others
  ries:/srv dont cry at 80, but 90

1  2 
config/nagios-master.cfg

Simple merge