Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 23:33:48 +0000 (19:33 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 23:33:48 +0000 (19:33 -0400)

Trivial merge