]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Fri, 24 Jun 2016 18:38:00 +0000 (11:38 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Fri, 24 Jun 2016 18:38:00 +0000 (11:38 -0700)

Trivial merge