]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Sat, 16 Jul 2016 23:13:51 +0000 (16:13 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 16 Jul 2016 23:13:51 +0000 (16:13 -0700)

Trivial merge