merge 3.5 (#25060)

author Benjamin Peterson <benjamin@python.org>

Fri, 11 Sep 2015 04:11:26 +0000 (21:11 -0700)

committer Benjamin Peterson <benjamin@python.org>

Fri, 11 Sep 2015 04:11:26 +0000 (21:11 -0700)
author Benjamin Peterson <benjamin@python.org>
Fri, 11 Sep 2015 04:11:26 +0000 (21:11 -0700)
committer Benjamin Peterson <benjamin@python.org>
Fri, 11 Sep 2015 04:11:26 +0000 (21:11 -0700)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/compile.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 11 Sep 2015 04:11:26 +0000 (21:11 -0700)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 11 Sep 2015 04:11:26 +0000 (21:11 -0700)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/compile.c	patch \|	diff1 \|	diff2 \|	blob \| history