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

Conflicts:
	dsa-nagios-checks/debian/changelog

diff --cc dsa-nagios-checks/debian/changelog
index ee05ea2,50a8da5..77cbb23
--- 1/dsa-nagios-checks/debian/changelog
--- 2/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@@ -8,16 -8,18 +8,19 @@@ dsa-nagios-checks (8X) unstable; urgenc
  
    [ Stephen Gran ]
    * dsa-check-apt-status: it's not an error to exit when we don't need to run
++  * Update check-hpacucli to deal with dual domain and 6GBPS SAS
  
    [ Peter Palfrader ]
    * Add checks/dsa-check-backuppg.
    * dsa-check-mirrorsync: optionally allow some skew over mirror timestamps.
    * Add dsa-check-log-age-loghost.
+   * dsa-check-zone-rrsig-expiration-many: also allow checking of geozones.
+   * dsa-check-dnssec-delegation: allow multiple dirs to be checked.
  
 -  [ Stephen Gran ]
 -  * Update check-hpacucli to deal with dual domain and 6GBPS SAS
 +  [ Martin Zobel-Helas ]
 +  * Add checks/dsa-checks-file.
  
 - -- Stephen Gran <sgran@debian.org>  Sat, 03 Jul 2010 16:23:58 +0100
 + -- Martin Zobel-Helas <zobel@debian.org>  Fri, 23 Jul 2010 19:26:00 +0200
  
  dsa-nagios-checks (86) unstable; urgency=low