]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#21135)
authorBenjamin Peterson <benjamin@python.org>
Thu, 3 Apr 2014 14:22:22 +0000 (10:22 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 3 Apr 2014 14:22:22 +0000 (10:22 -0400)

Trivial merge