]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorRaymond Hettinger <python@rcn.com>
Sun, 10 Feb 2013 01:01:59 +0000 (20:01 -0500)
committerRaymond Hettinger <python@rcn.com>
Sun, 10 Feb 2013 01:01:59 +0000 (20:01 -0500)

Trivial merge