]> granicus.if.org Git - python/commitdiff
merge 2.7 release branch
authorBenjamin Peterson <benjamin@python.org>
Mon, 9 Apr 2012 18:54:09 +0000 (14:54 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 9 Apr 2012 18:54:09 +0000 (14:54 -0400)
1  2 
Objects/unicodeobject.c

Simple merge