]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Thu, 14 Jul 2016 02:58:47 +0000 (19:58 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Thu, 14 Jul 2016 02:58:47 +0000 (19:58 -0700)

Trivial merge