]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Mon, 18 Jul 2016 04:58:11 +0000 (21:58 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Mon, 18 Jul 2016 04:58:11 +0000 (21:58 -0700)

Trivial merge