From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 17 Sep 2011 15:06:45 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=47713db6b3d8230b1cc6e2a8ff74d6935363c67f

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

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  another package that doesn't seem to want to go away on it's own
  unhold puppet no longer necessary
  Make command for re-enabling of exim and samhain slightly more robust
  nagios.git is known as dsa-nagios.git on db.d.o/git
  Add note about coordinating with users before upgrading
---

47713db6b3d8230b1cc6e2a8ff74d6935363c67f