]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 19 May 2014 21:21:24 +0000 (22:21 +0100)
committerRaymond Hettinger <python@rcn.com>
Mon, 19 May 2014 21:21:24 +0000 (22:21 +0100)

Trivial merge