]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 2 Oct 2015 15:50:44 +0000 (11:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 2 Oct 2015 15:50:44 +0000 (11:50 -0400)

Trivial merge