]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Sat, 15 Aug 2015 21:38:29 +0000 (14:38 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 15 Aug 2015 21:38:29 +0000 (14:38 -0700)

Trivial merge