]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 24 Oct 2016 14:32:23 +0000 (07:32 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 24 Oct 2016 14:32:23 +0000 (07:32 -0700)

Trivial merge