Merge branch 'debian/sid' into feature/install-progress-refactor
authorMichael Vogt <mvo@debian.org>
Thu, 17 Oct 2013 06:03:41 +0000 (08:03 +0200)
committerMichael Vogt <mvo@debian.org>
Thu, 17 Oct 2013 06:03:41 +0000 (08:03 +0200)
commite8022b09e73ee89d3b748e1c8dba82abba5b37f3
tree2bc51615c21c16040dbb31ebf873bdd2a29565d0
parent5e9458e285af11c7fa4308add10d250e3546c8bf
parentc420fe0096985234e861aaafc2b9908b6259a1bb
Merge branch 'debian/sid' into feature/install-progress-refactor

Conflicts:
apt-pkg/deb/dpkgpm.cc
apt-pkg/deb/dpkgpm.cc
apt-pkg/deb/dpkgpm.h