]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Thu, 29 Dec 2016 21:34:10 +0000 (21:34 +0000)
committerSimon McVittie <smcv@debian.org>
Thu, 29 Dec 2016 21:34:10 +0000 (21:34 +0000)

Trivial merge