]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sat, 30 Jul 2011 03:44:51 +0000 (22:44 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 30 Jul 2011 03:44:51 +0000 (22:44 -0500)
1  2 
Objects/object.c

Simple merge