Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 26 Sep 2014 23:16:51 +0000 (19:16 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 26 Sep 2014 23:16:51 +0000 (19:16 -0400)

Trivial merge