From: Michael Vogt <mvo@debian.org>
Date: Fri, 14 Feb 2014 21:28:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
X-Git-Tag: 0.9.15.3~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7d99e17ed33aa2d0c24d067d8bea5101af34fcad

Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
	apt-private/acqprogress.cc
---

7d99e17ed33aa2d0c24d067d8bea5101af34fcad