Merge 3.5 (issue #24975)

author Yury Selivanov <yselivanov@sprymix.com>

Wed, 2 Sep 2015 19:50:04 +0000 (15:50 -0400)

committer Yury Selivanov <yselivanov@sprymix.com>

Wed, 2 Sep 2015 19:50:04 +0000 (15:50 -0400)
author Yury Selivanov <yselivanov@sprymix.com>
Wed, 2 Sep 2015 19:50:04 +0000 (15:50 -0400)
committer Yury Selivanov <yselivanov@sprymix.com>
Wed, 2 Sep 2015 19:50:04 +0000 (15:50 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/ast.c
Simple merge
author	Yury Selivanov <yselivanov@sprymix.com>
	Wed, 2 Sep 2015 19:50:04 +0000 (15:50 -0400)
committer	Yury Selivanov <yselivanov@sprymix.com>
	Wed, 2 Sep 2015 19:50:04 +0000 (15:50 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/ast.c	patch \|	diff1 \|	diff2 \|	blob \| history