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

author Michael Vogt <mvo@ubuntu.com>

Thu, 25 Sep 2014 10:33:26 +0000 (12:33 +0200)

committer Michael Vogt <mvo@ubuntu.com>

Thu, 25 Sep 2014 10:33:26 +0000 (12:33 +0200)
author Michael Vogt <mvo@ubuntu.com>
Thu, 25 Sep 2014 10:33:26 +0000 (12:33 +0200)
committer Michael Vogt <mvo@ubuntu.com>
Thu, 25 Sep 2014 10:33:26 +0000 (12:33 +0200)
diff --cc methods/copy.cc
Simple merge
diff --cc methods/gpgv.cc
Simple merge
author	Michael Vogt <mvo@ubuntu.com>
	Thu, 25 Sep 2014 10:33:26 +0000 (12:33 +0200)
committer	Michael Vogt <mvo@ubuntu.com>
	Thu, 25 Sep 2014 10:33:26 +0000 (12:33 +0200)
		1	2
methods/copy.cc	patch \|	diff1 \|	diff2 \|	blob \| history
methods/gpgv.cc	patch \|	diff1 \|	diff2 \|	blob \| history