]> git.saurik.com Git - apt.git/commit - apt-pkg/acquire-item.cc
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Wed, 14 May 2014 16:04:48 +0000 (18:04 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 14 May 2014 16:04:48 +0000 (18:04 +0200)
commite110d7bf5675f484c06b82f621ac98bedc464865
tree70ce5da7ad75ccbaf4b30cf4809209993ba98b23
parent0b58b3f8917a49d83154fd3173bca36c1d617ef0
parent4f6d26b4d41474aa390329b7e9cb167eb70b2821
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h