]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #29292: Merge 3.5.
authorXiang Zhang <angwerzx@126.com>
Fri, 20 Jan 2017 03:29:48 +0000 (11:29 +0800)
committerXiang Zhang <angwerzx@126.com>
Fri, 20 Jan 2017 03:29:48 +0000 (11:29 +0800)

Trivial merge