]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Sun, 31 May 2015 23:40:12 +0000 (16:40 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Sun, 31 May 2015 23:40:12 +0000 (16:40 -0700)

Trivial merge