]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 3 Aug 2014 05:32:33 +0000 (22:32 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 3 Aug 2014 05:32:33 +0000 (22:32 -0700)

Trivial merge