Merge typo fixes from 3.5

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

Wed, 7 Oct 2015 11:13:55 +0000 (11:13 +0000)

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

Wed, 7 Oct 2015 11:13:55 +0000 (11:13 +0000)
author Martin Panter <vadmium+py@gmail.com>
Wed, 7 Oct 2015 11:13:55 +0000 (11:13 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Wed, 7 Oct 2015 11:13:55 +0000 (11:13 +0000)
diff --cc Doc/library/collections.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/typeobject.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Wed, 7 Oct 2015 11:13:55 +0000 (11:13 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Wed, 7 Oct 2015 11:13:55 +0000 (11:13 +0000)
		1	2
Doc/library/collections.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/typeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history