]> granicus.if.org Git - python/commitdiff
Merge from 3.6
authorSteve Dower <steve.dower@microsoft.com>
Sun, 5 Feb 2017 00:46:53 +0000 (16:46 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Sun, 5 Feb 2017 00:46:53 +0000 (16:46 -0800)

Trivial merge