]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 7 Jul 2013 03:50:01 +0000 (17:50 -1000)
committerRaymond Hettinger <python@rcn.com>
Sun, 7 Jul 2013 03:50:01 +0000 (17:50 -1000)

Trivial merge