]> git.saurik.com Git - apt.git/commit
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
authorMichael Vogt <mvo@debian.org>
Mon, 29 Sep 2014 07:58:38 +0000 (09:58 +0200)
committerMichael Vogt <mvo@debian.org>
Mon, 29 Sep 2014 07:58:38 +0000 (09:58 +0200)
commit4c333a25a88b1afac2ed50bf1b9af61dc5b09343
treed4b90a7bc46e9da364efb74365a0af604b38e424
parentbca84917c326fa3158e120147c8aecebe0789b47
parent6eb377fb9fba6b7f17f635143e9201f0d62a50fb
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/gpgv.cc
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/acquire.cc
methods/copy.cc
methods/gpgv.cc