]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 6 Oct 2013 00:20:18 +0000 (17:20 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 6 Oct 2013 00:20:18 +0000 (17:20 -0700)

Trivial merge