]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 3 Jun 2016 05:37:01 +0000 (01:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 3 Jun 2016 05:37:01 +0000 (01:37 -0400)

Trivial merge