Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)

Trivial merge