]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 31 Dec 2016 19:03:16 +0000 (12:03 -0700)
committerRaymond Hettinger <python@rcn.com>
Sat, 31 Dec 2016 19:03:16 +0000 (12:03 -0700)

Trivial merge