]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Mon, 19 Sep 2016 01:00:32 +0000 (18:00 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 19 Sep 2016 01:00:32 +0000 (18:00 -0700)

Trivial merge