]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 4 Aug 2013 19:04:11 +0000 (12:04 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 4 Aug 2013 19:04:11 +0000 (12:04 -0700)

Trivial merge