]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 1 Sep 2013 04:28:58 +0000 (21:28 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 1 Sep 2013 04:28:58 +0000 (21:28 -0700)

Trivial merge