Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 2 Jan 2015 16:45:54 +0000 (12:45 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 2 Jan 2015 16:45:54 +0000 (12:45 -0400)

Trivial merge