]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorYury Selivanov <yury@magic.io>
Wed, 9 Nov 2016 00:19:52 +0000 (19:19 -0500)
committerYury Selivanov <yury@magic.io>
Wed, 9 Nov 2016 00:19:52 +0000 (19:19 -0500)
1  2 
Objects/genobject.c

Simple merge