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

Trivial merge