]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 10 Nov 2014 01:21:20 +0000 (17:21 -0800)
committerRaymond Hettinger <python@rcn.com>
Mon, 10 Nov 2014 01:21:20 +0000 (17:21 -0800)

Trivial merge