]> git.saurik.com Git - apt.git/commit
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)
commit7d99e17ed33aa2d0c24d067d8bea5101af34fcad
tree26978b890a0faf2fb89bf036f00697c9dfb5e749
parentf2f53128c01f0620ab21c312cd6601d903aaae3c
parent4c90bc28889b9570096148e18e4433d18ab51a12
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
apt-private/acqprogress.cc