]> granicus.if.org Git - python/commitdiff
Merge with 3.3
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
1  2 
Lib/tokenize.py
Misc/NEWS

diff --cc Lib/tokenize.py
Simple merge
diff --cc Misc/NEWS
Simple merge