]> granicus.if.org Git - python/commitdiff
#5057: Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
1  2 
Lib/test/test_peepholer.py
Misc/NEWS
Python/peephole.c

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