]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Fri, 17 Jul 2015 18:59:57 +0000 (11:59 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Fri, 17 Jul 2015 18:59:57 +0000 (11:59 -0700)

Trivial merge