]> granicus.if.org Git - python/commitdiff
#16306: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 23 Nov 2012 16:52:39 +0000 (18:52 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 23 Nov 2012 16:52:39 +0000 (18:52 +0200)
1  2 
Lib/test/test_cmd_line.py
Modules/main.c

Simple merge
diff --cc Modules/main.c
Simple merge