Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 26 Jun 2013 15:23:59 +0000 (11:23 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 26 Jun 2013 15:23:59 +0000 (11:23 -0400)

Trivial merge