]> git.saurik.com Git - apt.git/commitdiff
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)
Conflicts:
cmdline/apt-helper.cc
test/integration/framework
test/integration/test-apt-https-no-redirect


No differences found