]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 3 Apr 2014 15:01:44 +0000 (08:01 -0700)
committerRaymond Hettinger <python@rcn.com>
Thu, 3 Apr 2014 15:01:44 +0000 (08:01 -0700)

Trivial merge