]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Tue, 29 Dec 2015 01:18:21 +0000 (17:18 -0800)
committerBrett Cannon <brett@python.org>
Tue, 29 Dec 2015 01:18:21 +0000 (17:18 -0800)

Trivial merge