]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 30 May 2015 05:14:50 +0000 (22:14 -0700)
committerRaymond Hettinger <python@rcn.com>
Sat, 30 May 2015 05:14:50 +0000 (22:14 -0700)

Trivial merge