merge 3.5 (#25973)

author Benjamin Peterson <benjamin@python.org>

Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)

committer Benjamin Peterson <benjamin@python.org>

Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)
author Benjamin Peterson <benjamin@python.org>
Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)
committer Benjamin Peterson <benjamin@python.org>
Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/symtable.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/symtable.c	patch \|	diff1 \|	diff2 \|	blob \| history