Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess
authorMichael Vogt <mvo@debian.org>
Fri, 27 Dec 2013 23:31:01 +0000 (00:31 +0100)
committerMichael Vogt <mvo@debian.org>
Fri, 27 Dec 2013 23:31:01 +0000 (00:31 +0100)
commit35ac30ee373c5ed84d7c2c5a701ac2d54963504d
tree59da7e2385b396052c4f53ac187d520c00d2790c
parente5c2b7e8a5455e1dc6993ef9e151b3845fb53c60
parentc035b6552ba4bd1c6fba5fd8f8d829c2efbefe3c
Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess

Conflicts:
apt-pkg/install-progress.cc
apt-pkg/deb/dpkgpm.cc
apt-pkg/install-progress.cc