merge
authorRaymond Hettinger <python@rcn.com>
Tue, 22 Nov 2016 19:50:56 +0000 (11:50 -0800)
committerRaymond Hettinger <python@rcn.com>
Tue, 22 Nov 2016 19:50:56 +0000 (11:50 -0800)
1  2 
Python/ceval.c

diff --cc Python/ceval.c
Simple merge