]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Wed, 12 Oct 2016 05:42:40 +0000 (01:42 -0400)
committerRaymond Hettinger <python@rcn.com>
Wed, 12 Oct 2016 05:42:40 +0000 (01:42 -0400)

Trivial merge