merge 3.5 (#25502)

author Benjamin Peterson <benjamin@python.org>

Thu, 29 Oct 2015 06:15:22 +0000 (23:15 -0700)

committer Benjamin Peterson <benjamin@python.org>

Thu, 29 Oct 2015 06:15:22 +0000 (23:15 -0700)
author Benjamin Peterson <benjamin@python.org>
Thu, 29 Oct 2015 06:15:22 +0000 (23:15 -0700)
committer Benjamin Peterson <benjamin@python.org>
Thu, 29 Oct 2015 06:15:22 +0000 (23:15 -0700)
diff --cc Lib/pickletools.py
Simple merge
diff --cc Parser/asdl_c.py

index d5971226b1885aaf12ff36f7128205a690bc3dd6,79e834b3dc89a598857860835bb3ac9e7d82a275..3128078c6bba63a8e1a927d791ac1e38affda95f

mode 100644,100755..100644
--- 1/Parser/asdl_c.py
--- 2/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
author	Benjamin Peterson <benjamin@python.org>
	Thu, 29 Oct 2015 06:15:22 +0000 (23:15 -0700)
committer	Benjamin Peterson <benjamin@python.org>
	Thu, 29 Oct 2015 06:15:22 +0000 (23:15 -0700)
		1	2
Lib/pickletools.py	patch \|	diff1 \|	diff2 \|	blob \| history
Parser/asdl_c.py	patch \|	diff1 \|	diff2 \|	blob \| history