]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 18 Aug 2011 18:52:19 +0000 (13:52 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 18 Aug 2011 18:52:19 +0000 (13:52 -0500)
1  2 
Objects/unicodeobject.c

Simple merge