]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorBrett Cannon <brett@python.org>
Fri, 24 Jun 2016 19:23:23 +0000 (12:23 -0700)
committerBrett Cannon <brett@python.org>
Fri, 24 Jun 2016 19:23:23 +0000 (12:23 -0700)

Trivial merge