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)
commit60206b33180cbfae436b5ee7323e36583df6e437
tree2de2701d4b28cbeee36d03f3bcb3b43fa0aa263f
parentbc8d9d0b9a1feda7b82d2643038b80c9a610b896
parent8a442609eb3f4b305eb6389e27eed835efaf79f6
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  minor dchroot updates
  new machine update: install samhain last