]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorJoey Hess <joeyh@joeyh.name>
Thu, 28 Apr 2016 23:06:01 +0000 (19:06 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 28 Apr 2016 23:06:01 +0000 (19:06 -0400)

Trivial merge