Issue #23406: Merge 3.4 into 3.5

author Martin Panter <vadmium>

Mon, 7 Sep 2015 02:10:59 +0000 (02:10 +0000)

committer Martin Panter <vadmium>

Mon, 7 Sep 2015 02:10:59 +0000 (02:10 +0000)
author Martin Panter <vadmium>
Mon, 7 Sep 2015 02:10:59 +0000 (02:10 +0000)
committer Martin Panter <vadmium>
Mon, 7 Sep 2015 02:10:59 +0000 (02:10 +0000)
diff --cc Doc/library/stdtypes.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Martin Panter <vadmium>
	Mon, 7 Sep 2015 02:10:59 +0000 (02:10 +0000)
committer	Martin Panter <vadmium>
	Mon, 7 Sep 2015 02:10:59 +0000 (02:10 +0000)
		1	2
Doc/library/stdtypes.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history