]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 24 Nov 2013 22:53:54 +0000 (14:53 -0800)
committerRaymond Hettinger <python@rcn.com>
Sun, 24 Nov 2013 22:53:54 +0000 (14:53 -0800)
1  2 
Objects/descrobject.c

Simple merge