Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Tue, 23 Dec 2014 18:20:19 +0000 (14:20 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 23 Dec 2014 18:20:19 +0000 (14:20 -0400)

Trivial merge