]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 12 Aug 2016 16:44:18 +0000 (09:44 -0700)
committerRaymond Hettinger <python@rcn.com>
Fri, 12 Aug 2016 16:44:18 +0000 (09:44 -0700)

Trivial merge