]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Thu, 6 Oct 2016 06:29:22 +0000 (23:29 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 6 Oct 2016 06:29:22 +0000 (23:29 -0700)

Trivial merge