Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 11 Oct 2012 15:22:50 +0000 (11:22 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 11 Oct 2012 15:22:50 +0000 (11:22 -0400)

Trivial merge