]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 23 May 2014 02:47:11 +0000 (03:47 +0100)
committerRaymond Hettinger <python@rcn.com>
Fri, 23 May 2014 02:47:11 +0000 (03:47 +0100)

Trivial merge