merge 3.4 (#24806)

author Benjamin Peterson <benjamin@python.org>

Wed, 7 Oct 2015 02:42:02 +0000 (19:42 -0700)

committer Benjamin Peterson <benjamin@python.org>

Wed, 7 Oct 2015 02:42:02 +0000 (19:42 -0700)
author Benjamin Peterson <benjamin@python.org>
Wed, 7 Oct 2015 02:42:02 +0000 (19:42 -0700)
committer Benjamin Peterson <benjamin@python.org>
Wed, 7 Oct 2015 02:42:02 +0000 (19:42 -0700)
diff --cc Lib/test/test_descr.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/typeobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Wed, 7 Oct 2015 02:42:02 +0000 (19:42 -0700)
committer	Benjamin Peterson <benjamin@python.org>
	Wed, 7 Oct 2015 02:42:02 +0000 (19:42 -0700)
		1	2
Lib/test/test_descr.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/typeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history