]> granicus.if.org Git - python/commitdiff
merge 3.6 (#29057)
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:30:35 +0000 (22:30 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:30:35 +0000 (22:30 -0600)

Trivial merge