Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
authorMichael Vogt <mvo@ubuntu.com>
Tue, 7 Oct 2014 14:38:03 +0000 (16:38 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Tue, 7 Oct 2014 14:38:03 +0000 (16:38 +0200)
commit4d0818cc39f7c0d44ecdfcdf9701058f81caa492
tree63eaa546ba527209d2b2068d188800e5e4872093
parentea7682a0d91fee638eef06b63045b1499ddf50ac
parent00a06b8eb82cf930511fc003bd16d7034e5a0cb5
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
cmdline/apt-get.cc
debian/apt.postinst
test/integration/framework
test/integration/test-compressed-indexes
test/integration/test-pdiff-usage