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

Trivial merge