]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Wed, 5 Aug 2015 18:49:20 +0000 (11:49 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Wed, 5 Aug 2015 18:49:20 +0000 (11:49 -0700)

Trivial merge