Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress...
authorMichael Vogt <mvo@debian.org>
Tue, 22 Oct 2013 20:05:15 +0000 (22:05 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 22 Oct 2013 20:06:24 +0000 (22:06 +0200)
commit51355387e5a5d4d7275a34b1c22f0ef5a76172d5
treee40c80a0d5268eb42cf71461e5ef9494658e1b7d
parentb4017ba767e15dc06c73915efaf36409ee099bf2
parent4b9969da40ff1dff2f5787feff5103c873c57f7f
Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress-refactor

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