]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#21357)
authorBenjamin Peterson <benjamin@python.org>
Sun, 4 May 2014 00:16:59 +0000 (20:16 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 4 May 2014 00:16:59 +0000 (20:16 -0400)

Trivial merge