Merge branch 'master' of ssh://ikiwiki.branchable.com
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:39:18 +0000 (21:39 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:39:18 +0000 (21:39 +0100)

Trivial merge