Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

author Michael Vogt <mvo@ubuntu.com>

Fri, 5 Sep 2014 12:47:22 +0000 (14:47 +0200)

committer Michael Vogt <mvo@ubuntu.com>

Fri, 5 Sep 2014 12:47:22 +0000 (14:47 +0200)
author Michael Vogt <mvo@ubuntu.com>
Fri, 5 Sep 2014 12:47:22 +0000 (14:47 +0200)
committer Michael Vogt <mvo@ubuntu.com>
Fri, 5 Sep 2014 12:47:22 +0000 (14:47 +0200)
diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
Simple merge
author	Michael Vogt <mvo@ubuntu.com>
	Fri, 5 Sep 2014 12:47:22 +0000 (14:47 +0200)
committer	Michael Vogt <mvo@ubuntu.com>
	Fri, 5 Sep 2014 12:47:22 +0000 (14:47 +0200)
		1	2
apt-pkg/acquire-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
test/integration/test-ubuntu-bug-346386-apt-get-update-paywall	patch \|	diff1 \|	diff2 \|	blob \| history