]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorRaymond Hettinger <python@rcn.com>
Tue, 30 Aug 2016 20:46:29 +0000 (13:46 -0700)
committerRaymond Hettinger <python@rcn.com>
Tue, 30 Aug 2016 20:46:29 +0000 (13:46 -0700)

Trivial merge