]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 23 Jun 2014 02:47:55 +0000 (19:47 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 23 Jun 2014 02:47:55 +0000 (19:47 -0700)

Trivial merge