]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Fri, 10 Feb 2017 06:35:38 +0000 (22:35 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 10 Feb 2017 06:35:38 +0000 (22:35 -0800)

Trivial merge