]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 2.7.10 release branch
authorBenjamin Peterson <benjamin@python.org>
Fri, 22 May 2015 22:55:22 +0000 (17:55 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 22 May 2015 22:55:22 +0000 (17:55 -0500)

Trivial merge