Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@ubuntu.com>
Tue, 23 Sep 2014 12:20:27 +0000 (14:20 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Tue, 23 Sep 2014 12:20:27 +0000 (14:20 +0200)
commitc511c5e8ed3f59ddee1b174b39e5cc16a2f11922
tree732e4b2ff090c01bb07dedeefe25cd517070c256
parent8c782efd93342c6119e8ba2ff6989b7a164b7f3d
parentd916e2a93b798e29d342e9498266767c5be8e2a5
Merge branch 'debian/sid' into debian/experimental

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/cachefilter.h
configure.ac
debian/changelog
16 files changed:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/contrib/fileutl.h
apt-pkg/contrib/strutl.cc
apt-pkg/deb/dpkgpm.cc
apt-pkg/deb/dpkgpm.h
apt-pkg/tagfile.cc
apt-private/private-list.cc
configure.ac
debian/changelog
debian/gbp.conf
methods/server.cc
methods/server.h
test/integration/framework
test/integration/test-apt-progress-fd
test/libapt/strutil_test.cc