merge 3.5

author Benjamin Peterson <benjamin@python.org>

Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)

committer Benjamin Peterson <benjamin@python.org>

Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)
author Benjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)
committer Benjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)
diff --cc Modules/_collectionsmodule.c
Simple merge
diff --cc Modules/itertoolsmodule.c
Simple merge
diff --cc Objects/setobject.c
Simple merge
diff --cc README
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)
		1	2
Modules/_collectionsmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/itertoolsmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/setobject.c	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history