]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 28 May 2016 21:06:48 +0000 (14:06 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 28 May 2016 21:06:48 +0000 (14:06 -0700)

Trivial merge