]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of git://ikiwiki.branchable.com
authorLouis <spalax@gresille.org>
Sat, 18 Feb 2017 21:56:06 +0000 (22:56 +0100)
committerLouis <spalax@gresille.org>
Sat, 18 Feb 2017 21:56:06 +0000 (22:56 +0100)

Trivial merge