From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 23 May 2010 12:55:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=commitdiff_plain;h=b4a2207497cf87fd5b342859c28d86ef41130ac6

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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  Update changelog
  A postgres WAL backup check
  Revert "na, there is now acpid running on mundy"
  bring changelog back into touch with deployed version, and add changelog entry for previous commit
  dsa-update-apt-status: it's not an error to exit when we don't need to run
  prep release
---

b4a2207497cf87fd5b342859c28d86ef41130ac6