Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 29 Dec 2011 16:08:48 +0000 (12:08 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 29 Dec 2011 16:08:48 +0000 (12:08 -0400)

Trivial merge