Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 16 Aug 2012 23:44:54 +0000 (16:44 -0700)
committerJoey Hess <joey@kitenet.net>
Thu, 16 Aug 2012 23:44:54 +0000 (16:44 -0700)

Trivial merge