]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Wed, 7 Sep 2016 03:42:17 +0000 (20:42 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 7 Sep 2016 03:42:17 +0000 (20:42 -0700)
1  2 
Objects/unicodeobject.c

Simple merge