]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 09:08:04 +0000 (02:08 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 09:08:04 +0000 (02:08 -0700)

Trivial merge