Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 6 Jan 2012 12:05:13 +0000 (13:05 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 6 Jan 2012 12:05:13 +0000 (13:05 +0100)
commit71276bb00d80d4169cbfa2b07e508a3f11e7c05b
tree289fe71bc72006c4739fd06c6b126f73ef4023f7
parent61b2dd06348a9b3866ec8bcbeaec74ac7d6ecf8a
parent310051f8594cda4a443aecaec98dfb4c1fcb3b28
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Fix path to libvirt xml files
  Document /SWAPFILES in script