]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Wed, 14 May 2014 05:21:04 +0000 (22:21 -0700)
committerRaymond Hettinger <python@rcn.com>
Wed, 14 May 2014 05:21:04 +0000 (22:21 -0700)

Trivial merge