]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Thu, 16 Jul 2015 23:34:09 +0000 (16:34 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Thu, 16 Jul 2015 23:34:09 +0000 (16:34 -0700)

Trivial merge