]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:30:49 +0000 (22:30 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:30:49 +0000 (22:30 -0600)

Trivial merge