]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Mon, 25 Jul 2016 01:06:51 +0000 (18:06 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Mon, 25 Jul 2016 01:06:51 +0000 (18:06 -0700)

Trivial merge