From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 22 May 2015 14:17:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
X-Git-Tag: 1.0.9.10~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0f3150e7040f45565b459a1390606bc2f714f6a8

Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid

Conflicts:
	apt-pkg/deb/dpkgpm.cc
---

0f3150e7040f45565b459a1390606bc2f714f6a8