]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#21105)
authorBenjamin Peterson <benjamin@python.org>
Sun, 30 Mar 2014 19:07:25 +0000 (15:07 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 30 Mar 2014 19:07:25 +0000 (15:07 -0400)

Trivial merge