Merge git (1:1.7.10.4-1+wheezy6) import into refs/heads/workingbranch
authorAntoine Beaupré <anarcat@debian.org>
Mon, 2 Oct 2017 19:47:26 +0000 (20:47 +0100)
committerAntoine Beaupré <anarcat@debian.org>
Mon, 2 Oct 2017 19:47:26 +0000 (20:47 +0100)

Trivial merge