]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 20 Jan 2017 05:39:55 +0000 (21:39 -0800)
committerRaymond Hettinger <python@rcn.com>
Fri, 20 Jan 2017 05:39:55 +0000 (21:39 -0800)

Trivial merge