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