Merge 3.4 (faulthandler ICC)

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

Mon, 23 Mar 2015 20:21:00 +0000 (21:21 +0100)

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

Mon, 23 Mar 2015 20:21:00 +0000 (21:21 +0100)
author Victor Stinner <victor.stinner@gmail.com>
Mon, 23 Mar 2015 20:21:00 +0000 (21:21 +0100)
committer Victor Stinner <victor.stinner@gmail.com>
Mon, 23 Mar 2015 20:21:00 +0000 (21:21 +0100)
diff --cc Misc/ACKS
Simple merge
diff --cc Modules/faulthandler.c
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Mon, 23 Mar 2015 20:21:00 +0000 (21:21 +0100)
committer	Victor Stinner <victor.stinner@gmail.com>
	Mon, 23 Mar 2015 20:21:00 +0000 (21:21 +0100)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/faulthandler.c	patch \|	diff1 \|	diff2 \|	blob \| history