]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Tue, 11 Aug 2015 04:01:00 +0000 (21:01 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Tue, 11 Aug 2015 04:01:00 +0000 (21:01 -0700)

Trivial merge