]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Wed, 2 Mar 2016 20:35:45 +0000 (16:35 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 2 Mar 2016 20:35:45 +0000 (16:35 -0400)

Trivial merge