]> granicus.if.org Git - python/commitdiff
Merge from 3.6.
authorEric V. Smith <eric@trueblade.com>
Mon, 7 Nov 2016 22:57:48 +0000 (17:57 -0500)
committerEric V. Smith <eric@trueblade.com>
Mon, 7 Nov 2016 22:57:48 +0000 (17:57 -0500)

Trivial merge