]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 21 Jul 2014 04:31:35 +0000 (21:31 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 21 Jul 2014 04:31:35 +0000 (21:31 -0700)

Trivial merge