Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
authorMichael Vogt <mvo@ubuntu.com>
Tue, 23 Sep 2014 13:47:44 +0000 (15:47 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Tue, 23 Sep 2014 13:47:44 +0000 (15:47 +0200)
commitdb1d1c32149177c0b6ca49e5107ab1f5fd364660
treeb06b22a9c92455b32889c88407f4190113a5cdd9
parent916b89109cd77728004819d4705778e3dc489b2e
parentc511c5e8ed3f59ddee1b174b39e5cc16a2f11922
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/copy.cc
test/integration/test-hashsum-verification
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/copy.cc