Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 14 Mar 2013 15:29:28 +0000 (11:29 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 14 Mar 2013 15:29:28 +0000 (11:29 -0400)

Trivial merge