]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 3 May 2014 22:26:17 +0000 (15:26 -0700)
committerRaymond Hettinger <python@rcn.com>
Sat, 3 May 2014 22:26:17 +0000 (15:26 -0700)

Trivial merge