From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 29 Oct 2015 06:15:22 +0000 (-0700)
Subject: merge 3.5 (#25502)
X-Git-Tag: v3.6.0a1~1156^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=860c8a404ae540e5db076b2ca9b0605c30728dd9;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25502)
---

860c8a404ae540e5db076b2ca9b0605c30728dd9
diff --cc Parser/asdl_c.py
index d5971226b188,79e834b3dc89..3128078c6bba
mode 100644,100755..100644
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py