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

Trivial merge