]> granicus.if.org Git - python/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Fri, 9 Sep 2016 18:19:16 +0000 (11:19 -0700)
committerBrett Cannon <brett@python.org>
Fri, 9 Sep 2016 18:19:16 +0000 (11:19 -0700)

Trivial merge