From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 8 Jul 2012 20:14:56 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=453694b45c0975f7e31e7216cfa04a26f6093054;p=mirror%2Fdsa-nagios.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  aha, that was subtle
  clean up some duplicates
  vivaldi/fossology has gone away
  as has sperger
  this has been down for 6 months
  no more bellini
  Different buildd check for fbsd hosts
  Different thresholds for /srv on beach
  add fils
  autofs on ullmann
  Change gw-1&1
  ullmann also has apaches
---

453694b45c0975f7e31e7216cfa04a26f6093054