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

Trivial merge