]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 21 Nov 2016 10:00:04 +0000 (02:00 -0800)
committerRaymond Hettinger <python@rcn.com>
Mon, 21 Nov 2016 10:00:04 +0000 (02:00 -0800)

Trivial merge