]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 17 Nov 2016 06:56:37 +0000 (22:56 -0800)
committerRaymond Hettinger <python@rcn.com>
Thu, 17 Nov 2016 06:56:37 +0000 (22:56 -0800)

Trivial merge