]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 9 Sep 2013 07:02:05 +0000 (02:02 -0500)
committerRaymond Hettinger <python@rcn.com>
Mon, 9 Sep 2013 07:02:05 +0000 (02:02 -0500)

Trivial merge