]> granicus.if.org Git - python/commitdiff
Merge heads.
authorXavier de Gaye <xdegaye@users.sourceforge.net>
Fri, 28 Oct 2016 09:37:17 +0000 (11:37 +0200)
committerXavier de Gaye <xdegaye@users.sourceforge.net>
Fri, 28 Oct 2016 09:37:17 +0000 (11:37 +0200)

Trivial merge