]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Thu, 26 Jan 2017 07:35:46 +0000 (23:35 -0800)
committerBenjamin Peterson <benjamin@python.org>
Thu, 26 Jan 2017 07:35:46 +0000 (23:35 -0800)

Trivial merge