]> granicus.if.org Git - python/commitdiff
merge 3.3 (#16906)
authorBenjamin Peterson <benjamin@python.org>
Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
1  2 
Misc/NEWS
Objects/unicodeobject.c

diff --cc Misc/NEWS
Simple merge
Simple merge