Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file
authorMichael Vogt <mvo@debian.org>
Wed, 12 Mar 2014 19:40:01 +0000 (20:40 +0100)
committerMichael Vogt <mvo@debian.org>
Wed, 12 Mar 2014 19:40:01 +0000 (20:40 +0100)
commit32120cde98308448fbcd31cf7841f13a86d3e0a8
tree102ec9f093480109c14d7f0450bc4a584d42a4c0
parentc1409d1be88557529c62883be3174793481233de
parent9e3142e16c2ccb4b51f5a8122f5a8e8c0fab9f9a
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file

Conflicts:
cmdline/apt-helper.cc
test/integration/framework
test/integration/test-apt-https-no-redirect
cmdline/apt-helper.cc
test/integration/test-apt-https-no-redirect