]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 10 Mar 2013 16:42:22 +0000 (09:42 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 10 Mar 2013 16:42:22 +0000 (09:42 -0700)

Trivial merge