]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Fri, 15 Jul 2016 19:01:07 +0000 (12:01 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Fri, 15 Jul 2016 19:01:07 +0000 (12:01 -0700)

Trivial merge