]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 5 Sep 2016 17:17:22 +0000 (10:17 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 5 Sep 2016 17:17:22 +0000 (10:17 -0700)

Trivial merge