]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 1 Oct 2011 04:12:20 +0000 (00:12 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 1 Oct 2011 04:12:20 +0000 (00:12 -0400)
1  2 
Objects/unicodeobject.c

Simple merge