]> granicus.if.org Git - python/commitdiff
merge 3.6 (#28454)
authorBenjamin Peterson <benjamin@python.org>
Sun, 16 Oct 2016 22:42:33 +0000 (15:42 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 16 Oct 2016 22:42:33 +0000 (15:42 -0700)
1  2 
Objects/unicodeobject.c

Simple merge