]> granicus.if.org Git - python/commitdiff
merge 3.3 (#23362)
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 18:23:41 +0000 (13:23 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 18:23:41 +0000 (13:23 -0500)
1  2 
Objects/unicodeobject.c

Simple merge