]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Tue, 26 Apr 2016 08:11:28 +0000 (01:11 -0700)
committerRaymond Hettinger <python@rcn.com>
Tue, 26 Apr 2016 08:11:28 +0000 (01:11 -0700)

Trivial merge