Merge dpkg (1.18.24) import into refs/heads/workingbranch
authorGuillem Jover <guillem@debian.org>
Wed, 17 May 2017 11:16:25 +0000 (11:16 +0000)
committerGuillem Jover <guillem@debian.org>
Wed, 17 May 2017 11:16:25 +0000 (11:16 +0000)

Trivial merge