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

Trivial merge