]> granicus.if.org Git - python/commitdiff
merge 3.5 (#27248)
authorBenjamin Peterson <benjamin@python.org>
Thu, 7 Jul 2016 06:28:19 +0000 (23:28 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 7 Jul 2016 06:28:19 +0000 (23:28 -0700)
Patch from Xiang Zhang.

1  2 
Objects/typeobject.c

Simple merge