]> granicus.if.org Git - python/commitdiff
Merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 Oct 2014 03:58:32 +0000 (23:58 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 Oct 2014 03:58:32 +0000 (23:58 -0400)
1  2 
Objects/unicodeobject.c

Simple merge