]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Fri, 11 Sep 2015 15:47:55 +0000 (08:47 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Fri, 11 Sep 2015 15:47:55 +0000 (08:47 -0700)

Trivial merge