Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 4 Jun 2013 21:19:58 +0000 (17:19 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 4 Jun 2013 21:19:58 +0000 (17:19 -0400)

Trivial merge