]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 16:17:33 +0000 (12:17 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 16:17:33 +0000 (12:17 -0400)
1  2 
Objects/unicodeobject.c

Simple merge