]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 15 Jun 2014 21:50:39 +0000 (14:50 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 15 Jun 2014 21:50:39 +0000 (14:50 -0700)

Trivial merge