]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 315aa40 9c422f3)
merge 3.4 (closes #22643)
authorBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 16:17:47 +0000 (12:17 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 16:17:47 +0000 (12:17 -0400)
1  2 
Objects/unicodeobject.c patch | diff1 | diff2 | blob | history

diff --cc Objects/unicodeobject.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.