]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Mon, 27 Jun 2016 16:35:32 +0000 (09:35 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Mon, 27 Jun 2016 16:35:32 +0000 (09:35 -0700)

Trivial merge