]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Wed, 7 Sep 2016 00:16:41 +0000 (17:16 -0700)
committerBrett Cannon <brett@python.org>
Wed, 7 Sep 2016 00:16:41 +0000 (17:16 -0700)

Trivial merge