]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 4 Jun 2016 05:38:37 +0000 (22:38 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 4 Jun 2016 05:38:37 +0000 (22:38 -0700)

Trivial merge