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

Trivial merge