Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 5 May 2013 04:07:29 +0000 (00:07 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 5 May 2013 04:07:29 +0000 (00:07 -0400)

Trivial merge