]> granicus.if.org Git - python/commitdiff
Merge from 3.5 for issue #26664
authorBrett Cannon <brett@python.org>
Thu, 30 Jun 2016 18:43:19 +0000 (11:43 -0700)
committerBrett Cannon <brett@python.org>
Thu, 30 Jun 2016 18:43:19 +0000 (11:43 -0700)

Trivial merge