]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Tue, 1 Nov 2016 05:54:12 +0000 (22:54 -0700)
committerRaymond Hettinger <python@rcn.com>
Tue, 1 Nov 2016 05:54:12 +0000 (22:54 -0700)

Trivial merge