]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 7 Oct 2015 02:37:15 +0000 (19:37 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 7 Oct 2015 02:37:15 +0000 (19:37 -0700)

Trivial merge