]> granicus.if.org Git - python/commitdiff
merge 3.5 (#24022)
authorBenjamin Peterson <benjamin@python.org>
Mon, 19 Sep 2016 06:44:02 +0000 (23:44 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 19 Sep 2016 06:44:02 +0000 (23:44 -0700)
1  2 
Parser/tokenizer.c

Simple merge