]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 30 Jan 2015 06:02:17 +0000 (22:02 -0800)
committerRaymond Hettinger <python@rcn.com>
Fri, 30 Jan 2015 06:02:17 +0000 (22:02 -0800)

Trivial merge