]> granicus.if.org Git - python/commitdiff
merge 3.6 (#29398)
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Feb 2017 07:31:20 +0000 (23:31 -0800)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Feb 2017 07:31:20 +0000 (23:31 -0800)

Trivial merge