Issue #22274: Merge stderr=STDOUT fix from 3.5

author Martin Panter <vadmium+py@gmail.com>

Fri, 13 May 2016 07:45:21 +0000 (07:45 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Fri, 13 May 2016 07:45:21 +0000 (07:45 +0000)
author Martin Panter <vadmium+py@gmail.com>
Fri, 13 May 2016 07:45:21 +0000 (07:45 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Fri, 13 May 2016 07:45:21 +0000 (07:45 +0000)
diff --cc Lib/subprocess.py
Simple merge
diff --cc Lib/test/test_subprocess.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Fri, 13 May 2016 07:45:21 +0000 (07:45 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Fri, 13 May 2016 07:45:21 +0000 (07:45 +0000)
		1	2
Lib/subprocess.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_subprocess.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history