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)
* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Fix path to libvirt xml files
  Document /SWAPFILES in script


Trivial merge