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)
commit631b10b0dc0aad8d9f6523abfd2ebc27d244787c
treec3b8806d359bd7ef9d41f24ddbed30f7dc1d3529
parent79eac1515a88063ad07717f8fb5a302d9c535a47
parent82ecf858958b48c0d10401b2b5dd3f07127eb579
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* '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
config/nagios-master.cfg