Merge git (1:1.7.10.4-1+wheezy5) import into refs/heads/workingbranch
authorMarkus Koschany <apo@debian.org>
Sun, 27 Aug 2017 13:51:22 +0000 (14:51 +0100)
committerMarkus Koschany <apo@debian.org>
Sun, 27 Aug 2017 13:51:22 +0000 (14:51 +0100)

Trivial merge