merge

author Raymond Hettinger <python@rcn.com>

Tue, 12 Aug 2014 19:45:28 +0000 (12:45 -0700)

committer Raymond Hettinger <python@rcn.com>

Tue, 12 Aug 2014 19:45:28 +0000 (12:45 -0700)
author Raymond Hettinger <python@rcn.com>
Tue, 12 Aug 2014 19:45:28 +0000 (12:45 -0700)
committer Raymond Hettinger <python@rcn.com>
Tue, 12 Aug 2014 19:45:28 +0000 (12:45 -0700)
diff --cc Lib/functools.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Raymond Hettinger <python@rcn.com>
	Tue, 12 Aug 2014 19:45:28 +0000 (12:45 -0700)
committer	Raymond Hettinger <python@rcn.com>
	Tue, 12 Aug 2014 19:45:28 +0000 (12:45 -0700)
		1	2
Lib/functools.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history