]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Fri, 6 May 2016 19:05:45 +0000 (20:05 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 6 May 2016 19:05:45 +0000 (20:05 +0100)

Trivial merge