]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 2.7.10 release branch
authorBenjamin Peterson <benjamin@python.org>
Fri, 15 May 2015 16:19:41 +0000 (12:19 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 15 May 2015 16:19:41 +0000 (12:19 -0400)

Trivial merge