Merge 3.5 (Issue #24687)

author Yury Selivanov <yselivanov@sprymix.com>

Thu, 23 Jul 2015 06:11:13 +0000 (09:11 +0300)

committer Yury Selivanov <yselivanov@sprymix.com>

Thu, 23 Jul 2015 06:11:13 +0000 (09:11 +0300)
author Yury Selivanov <yselivanov@sprymix.com>
Thu, 23 Jul 2015 06:11:13 +0000 (09:11 +0300)
committer Yury Selivanov <yselivanov@sprymix.com>
Thu, 23 Jul 2015 06:11:13 +0000 (09:11 +0300)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/compile.c
Simple merge
author	Yury Selivanov <yselivanov@sprymix.com>
	Thu, 23 Jul 2015 06:11:13 +0000 (09:11 +0300)
committer	Yury Selivanov <yselivanov@sprymix.com>
	Thu, 23 Jul 2015 06:11:13 +0000 (09:11 +0300)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/compile.c	patch \|	diff1 \|	diff2 \|	blob \| history