]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Sat, 17 Dec 2016 20:39:36 +0000 (12:39 -0800)
committerBrett Cannon <brett@python.org>
Sat, 17 Dec 2016 20:39:36 +0000 (12:39 -0800)

Trivial merge