merge 3.4 (#23048)

author Benjamin Peterson <benjamin@python.org>

Sat, 13 Dec 2014 21:08:15 +0000 (16:08 -0500)

committer Benjamin Peterson <benjamin@python.org>

Sat, 13 Dec 2014 21:08:15 +0000 (16:08 -0500)
author Benjamin Peterson <benjamin@python.org>
Sat, 13 Dec 2014 21:08:15 +0000 (16:08 -0500)
committer Benjamin Peterson <benjamin@python.org>
Sat, 13 Dec 2014 21:08:15 +0000 (16:08 -0500)
diff --cc Lib/test/test_dis.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Python/compile.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Sat, 13 Dec 2014 21:08:15 +0000 (16:08 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Sat, 13 Dec 2014 21:08:15 +0000 (16:08 -0500)
		1	2
Lib/test/test_dis.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/compile.c	patch \|	diff1 \|	diff2 \|	blob \| history