]> git.saurik.com Git - apt.git/commitdiff
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Fri, 14 Feb 2014 21:28:34 +0000 (22:28 +0100)
committerMichael Vogt <mvo@debian.org>
Fri, 14 Feb 2014 21:28:34 +0000 (22:28 +0100)
Conflicts:
apt-private/acqprogress.cc


Trivial merge