]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Mon, 21 Jan 2019 15:44:58 +0000 (11:44 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 21 Jan 2019 15:44:58 +0000 (11:44 -0400)

Trivial merge