]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 17 Mar 2014 21:00:27 +0000 (16:00 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 17 Mar 2014 21:00:27 +0000 (16:00 -0500)

Trivial merge