Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 10 Jul 2013 21:08:02 +0000 (17:08 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 10 Jul 2013 21:08:02 +0000 (17:08 -0400)

Trivial merge