merge

author Raymond Hettinger <python@rcn.com>

Sat, 26 Sep 2015 07:15:46 +0000 (00:15 -0700)

committer Raymond Hettinger <python@rcn.com>

Sat, 26 Sep 2015 07:15:46 +0000 (00:15 -0700)
author Raymond Hettinger <python@rcn.com>
Sat, 26 Sep 2015 07:15:46 +0000 (00:15 -0700)
committer Raymond Hettinger <python@rcn.com>
Sat, 26 Sep 2015 07:15:46 +0000 (00:15 -0700)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_collectionsmodule.c
Simple merge
author	Raymond Hettinger <python@rcn.com>
	Sat, 26 Sep 2015 07:15:46 +0000 (00:15 -0700)
committer	Raymond Hettinger <python@rcn.com>
	Sat, 26 Sep 2015 07:15:46 +0000 (00:15 -0700)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_collectionsmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history