Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 6 Sep 2013 15:46:36 +0000 (11:46 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 6 Sep 2013 15:46:36 +0000 (11:46 -0400)

Trivial merge