]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.5
authorSteve Dower <steve.dower@microsoft.com>
Sat, 25 Jun 2016 23:43:26 +0000 (16:43 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 25 Jun 2016 23:43:26 +0000 (16:43 -0700)

Trivial merge