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

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