]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid' 3.20141016 debian/3.20141016
authorSimon McVittie <smcv@debian.org>
Thu, 16 Oct 2014 23:02:33 +0000 (00:02 +0100)
committerSimon McVittie <smcv@debian.org>
Thu, 16 Oct 2014 23:02:33 +0000 (00:02 +0100)

Trivial merge