]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#21115)
authorBenjamin Peterson <benjamin@python.org>
Mon, 31 Mar 2014 17:47:04 +0000 (13:47 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 31 Mar 2014 17:47:04 +0000 (13:47 -0400)

Trivial merge