]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Wed, 23 Sep 2015 00:35:55 +0000 (17:35 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Wed, 23 Sep 2015 00:35:55 +0000 (17:35 -0700)

Trivial merge