Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 23 Oct 2014 17:56:21 +0000 (13:56 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 23 Oct 2014 17:56:21 +0000 (13:56 -0400)

Trivial merge