Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sun, 28 Dec 2014 18:32:39 +0000 (14:32 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 28 Dec 2014 18:32:39 +0000 (14:32 -0400)

Trivial merge