]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 13 Mar 2015 21:21:29 +0000 (16:21 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 13 Mar 2015 21:21:29 +0000 (16:21 -0500)

Trivial merge