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

Trivial merge