]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 14 Oct 2016 05:20:00 +0000 (01:20 -0400)
committerRaymond Hettinger <python@rcn.com>
Fri, 14 Oct 2016 05:20:00 +0000 (01:20 -0400)

Trivial merge