Merge 3.5 (sys.setrecursionlimit)

author Victor Stinner <victor.stinner@gmail.com>

Mon, 12 Oct 2015 22:16:07 +0000 (00:16 +0200)

committer Victor Stinner <victor.stinner@gmail.com>

Mon, 12 Oct 2015 22:16:07 +0000 (00:16 +0200)
author Victor Stinner <victor.stinner@gmail.com>
Mon, 12 Oct 2015 22:16:07 +0000 (00:16 +0200)
committer Victor Stinner <victor.stinner@gmail.com>
Mon, 12 Oct 2015 22:16:07 +0000 (00:16 +0200)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_testcapimodule.c
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Mon, 12 Oct 2015 22:16:07 +0000 (00:16 +0200)
committer	Victor Stinner <victor.stinner@gmail.com>
	Mon, 12 Oct 2015 22:16:07 +0000 (00:16 +0200)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_testcapimodule.c	patch \|	diff1 \|	diff2 \|	blob \| history