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

Trivial merge