]> granicus.if.org Git - python/commitdiff
merge 3.3 (closes #18470)
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Jul 2013 03:47:47 +0000 (20:47 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Jul 2013 03:47:47 +0000 (20:47 -0700)
1  2 
Parser/tokenizer.c

Simple merge