]> granicus.if.org Git - python/commitdiff
Issue #29217: Merge 3.6.
authorXiang Zhang <angwerzx@126.com>
Tue, 10 Jan 2017 03:30:44 +0000 (11:30 +0800)
committerXiang Zhang <angwerzx@126.com>
Tue, 10 Jan 2017 03:30:44 +0000 (11:30 +0800)

Trivial merge