]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge for issue #25500
authorBrett Cannon <brett@python.org>
Fri, 4 Dec 2015 22:52:07 +0000 (14:52 -0800)
committerBrett Cannon <brett@python.org>
Fri, 4 Dec 2015 22:52:07 +0000 (14:52 -0800)

Trivial merge