]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Tue, 18 Aug 2015 23:01:25 +0000 (16:01 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Tue, 18 Aug 2015 23:01:25 +0000 (16:01 -0700)

Trivial merge