Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jmtd@debian.org>
Tue, 4 May 2010 15:44:31 +0000 (16:44 +0100)
committerJon Dowland <jmtd@debian.org>
Tue, 4 May 2010 15:44:31 +0000 (16:44 +0100)

Trivial merge