]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 22 Jul 2011 15:55:02 +0000 (10:55 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 22 Jul 2011 15:55:02 +0000 (10:55 -0500)
1  2 
Lib/test/test_ast.py
Misc/NEWS
Parser/asdl_c.py
Python/Python-ast.c

Simple merge
diff --cc Misc/NEWS
Simple merge
Simple merge
Simple merge