]> granicus.if.org Git - python/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Thu, 9 Jun 2016 23:59:13 +0000 (16:59 -0700)
committerBrett Cannon <brett@python.org>
Thu, 9 Jun 2016 23:59:13 +0000 (16:59 -0700)

Trivial merge