merge

author Raymond Hettinger <python@rcn.com>

Wed, 26 Aug 2015 15:09:50 +0000 (08:09 -0700)

committer Raymond Hettinger <python@rcn.com>

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