]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 29 Jan 2017 04:17:07 +0000 (20:17 -0800)
committerRaymond Hettinger <python@rcn.com>
Sun, 29 Jan 2017 04:17:07 +0000 (20:17 -0800)

Trivial merge