Merge remote-tracking branch 'mvo/bugfix/update-progress-reporting' into debian/exper...

author Michael Vogt <mvo@ubuntu.com>

Thu, 8 May 2014 07:48:51 +0000 (09:48 +0200)

committer Michael Vogt <mvo@ubuntu.com>

Thu, 8 May 2014 07:48:51 +0000 (09:48 +0200)
author Michael Vogt <mvo@ubuntu.com>
Thu, 8 May 2014 07:48:51 +0000 (09:48 +0200)
committer Michael Vogt <mvo@ubuntu.com>
Thu, 8 May 2014 07:48:51 +0000 (09:48 +0200)
diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc test/integration/framework
Simple merge
author	Michael Vogt <mvo@ubuntu.com>
	Thu, 8 May 2014 07:48:51 +0000 (09:48 +0200)
committer	Michael Vogt <mvo@ubuntu.com>
	Thu, 8 May 2014 07:48:51 +0000 (09:48 +0200)
		1	2
apt-pkg/acquire-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
test/integration/framework	patch \|	diff1 \|	diff2 \|	blob \| history