Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 8 Nov 2014 04:09:34 +0000 (00:09 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 Nov 2014 04:09:34 +0000 (00:09 -0400)

Trivial merge