]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Wed, 2 Apr 2014 10:17:33 +0000 (03:17 -0700)
committerRaymond Hettinger <python@rcn.com>
Wed, 2 Apr 2014 10:17:33 +0000 (03:17 -0700)

Trivial merge