]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 8 Sep 2016 18:44:26 +0000 (11:44 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 8 Sep 2016 18:44:26 +0000 (11:44 -0700)

Trivial merge