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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore fan lines that do not say 'Yes' in the present-line
  Fix --ignore-transfer-speed to not always ignore transfer speed
  dsa-check-udldap-freshness: Also check age of /var/lib/misc/passwd.db in addition to /var/lib/misc/thishost/passwd.tdb.
  Add dave as a contact for the sanger hosts
  dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM status.
  check quantz can ping one of its nfs servers
  kill trailing whitespace
  Give in to nagging users
  More exim processes for our mail relays
  and heininen has a var/log
  and lotti has a /srv

diff --cc config/nagios-master.cfg
Simple merge