]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#22954)
authorBenjamin Peterson <benjamin@python.org>
Thu, 27 Nov 2014 05:03:34 +0000 (23:03 -0600)
committerBenjamin Peterson <benjamin@python.org>
Thu, 27 Nov 2014 05:03:34 +0000 (23:03 -0600)
1  2 
Objects/typeobject.c

Simple merge