]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 31 Mar 2014 00:34:30 +0000 (20:34 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 31 Mar 2014 00:34:30 +0000 (20:34 -0400)

Trivial merge