]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 12 Sep 2016 00:24:05 +0000 (17:24 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 12 Sep 2016 00:24:05 +0000 (17:24 -0700)

Trivial merge