]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Mon, 14 Nov 2016 08:15:52 +0000 (00:15 -0800)
committerBenjamin Peterson <benjamin@python.org>
Mon, 14 Nov 2016 08:15:52 +0000 (00:15 -0800)

Trivial merge