From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 6 Jan 2012 12:05:13 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=71276bb00d80d4169cbfa2b07e508a3f11e7c05b

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
---

71276bb00d80d4169cbfa2b07e508a3f11e7c05b