merge

author Raymond Hettinger <python@rcn.com>

Sat, 31 Dec 2016 19:02:42 +0000 (12:02 -0700)

committer Raymond Hettinger <python@rcn.com>

Sat, 31 Dec 2016 19:02:42 +0000 (12:02 -0700)
author Raymond Hettinger <python@rcn.com>
Sat, 31 Dec 2016 19:02:42 +0000 (12:02 -0700)
committer Raymond Hettinger <python@rcn.com>
Sat, 31 Dec 2016 19:02:42 +0000 (12:02 -0700)
diff --cc Lib/collections/__init__.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Raymond Hettinger <python@rcn.com>
	Sat, 31 Dec 2016 19:02:42 +0000 (12:02 -0700)
committer	Raymond Hettinger <python@rcn.com>
	Sat, 31 Dec 2016 19:02:42 +0000 (12:02 -0700)
		1	2
Lib/collections/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history