]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 9 Jan 2017 02:22:41 +0000 (18:22 -0800)
committerRaymond Hettinger <python@rcn.com>
Mon, 9 Jan 2017 02:22:41 +0000 (18:22 -0800)

Trivial merge