]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Mon, 30 Nov 2015 21:02:07 +0000 (21:02 +0000)
committerSimon McVittie <smcv@debian.org>
Mon, 30 Nov 2015 21:02:07 +0000 (21:02 +0000)

Trivial merge