Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 15:55:10 +0000 (17:55 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 15:55:10 +0000 (17:55 +0200)
commit38d2959ffb8c6f5f291b2910014a67b1b352ab4c
treec5977b8f34aaf973ed3956952ec3ff43ac59f143
parentfce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a
parent3fa4e98f62e469f4292d2811b4e15f4afb678fbd
Merge branch 'debian/sid' into debian/experimental

Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
16 files changed:
apt-pkg/acquire-item.cc
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/fileutl.h
apt-pkg/contrib/netrc.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/deb/dpkgpm.cc
apt-pkg/pkgcache.cc
apt-pkg/pkgcache.h
apt-pkg/srcrecords.h
apt-private/private-list.cc
cmdline/apt-get.cc
debian/changelog
debian/control
debian/libapt-pkg4.13.symbols