Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jmtd@debian.org>
Fri, 3 Jun 2011 09:01:02 +0000 (10:01 +0100)
committerJon Dowland <jmtd@debian.org>
Fri, 3 Jun 2011 09:01:02 +0000 (10:01 +0100)

Trivial merge