]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 22 Mar 2015 22:29:48 +0000 (15:29 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 22 Mar 2015 22:29:48 +0000 (15:29 -0700)

Trivial merge