]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Tue, 20 Sep 2016 05:20:19 +0000 (22:20 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 20 Sep 2016 05:20:19 +0000 (22:20 -0700)

Trivial merge