Merge p7zip (9.20.1~dfsg.1-4+rpi2+deb7u2) import into refs/heads/workingbranch
authorRaspbian Automatic git importer <root@raspbian.org>
Sat, 24 Dec 2016 00:39:54 +0000 (00:39 +0000)
committerRaspbian Automatic git importer <root@raspbian.org>
Sat, 24 Dec 2016 00:39:54 +0000 (00:39 +0000)

Trivial merge