]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.6 (#28417)
authorBenjamin Peterson <benjamin@python.org>
Wed, 12 Oct 2016 06:01:12 +0000 (23:01 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 12 Oct 2016 06:01:12 +0000 (23:01 -0700)
1  2 
Objects/unicodeobject.c

Simple merge