]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 9 Jun 2016 06:18:56 +0000 (23:18 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 9 Jun 2016 06:18:56 +0000 (23:18 -0700)

Trivial merge