]> granicus.if.org Git - python/commitdiff
Issue #29292: Merge 3.6.
authorXiang Zhang <angwerzx@126.com>
Fri, 20 Jan 2017 03:31:31 +0000 (11:31 +0800)
committerXiang Zhang <angwerzx@126.com>
Fri, 20 Jan 2017 03:31:31 +0000 (11:31 +0800)

Trivial merge