]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 30 Dec 2016 06:57:31 +0000 (23:57 -0700)
committerRaymond Hettinger <python@rcn.com>
Fri, 30 Dec 2016 06:57:31 +0000 (23:57 -0700)

Trivial merge