Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 5 Mar 2013 21:19:43 +0000 (22:19 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 5 Mar 2013 21:19:43 +0000 (22:19 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  minor dchroot updates
  new machine update: install samhain last


Trivial merge