]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 4 Aug 2014 06:39:20 +0000 (23:39 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 4 Aug 2014 06:39:20 +0000 (23:39 -0700)

Trivial merge