]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Wed, 7 Oct 2015 03:08:11 +0000 (23:08 -0400)
committerRaymond Hettinger <python@rcn.com>
Wed, 7 Oct 2015 03:08:11 +0000 (23:08 -0400)

Trivial merge