]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 17 Jun 2014 06:07:15 +0000 (23:07 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 17 Jun 2014 06:07:15 +0000 (23:07 -0700)
1  2 
Python/ceval.c

diff --cc Python/ceval.c
Simple merge