]> granicus.if.org Git - python/commitdiff
Merge from 3.6.
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 25 Dec 2016 14:24:15 +0000 (16:24 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 25 Dec 2016 14:24:15 +0000 (16:24 +0200)

Trivial merge