]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 8 Apr 2014 14:51:37 +0000 (10:51 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 8 Apr 2014 14:51:37 +0000 (10:51 -0400)

Trivial merge