Issue #28394: Merge typo fixes from 3.6

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

Mon, 10 Oct 2016 00:42:50 +0000 (00:42 +0000)

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

Mon, 10 Oct 2016 00:42:50 +0000 (00:42 +0000)
author Martin Panter <vadmium+py@gmail.com>
Mon, 10 Oct 2016 00:42:50 +0000 (00:42 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Mon, 10 Oct 2016 00:42:50 +0000 (00:42 +0000)
diff --cc Misc/HISTORY
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Mon, 10 Oct 2016 00:42:50 +0000 (00:42 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Mon, 10 Oct 2016 00:42:50 +0000 (00:42 +0000)
		1	2
Misc/HISTORY	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history