]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 29 Apr 2012 21:57:05 +0000 (14:57 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 29 Apr 2012 21:57:05 +0000 (14:57 -0700)

Trivial merge