]> granicus.if.org Git - python/commitdiff
Merge from 3.6.
authorXavier de Gaye <xdegaye@users.sourceforge.net>
Tue, 13 Sep 2016 16:06:08 +0000 (18:06 +0200)
committerXavier de Gaye <xdegaye@users.sourceforge.net>
Tue, 13 Sep 2016 16:06:08 +0000 (18:06 +0200)

Trivial merge