]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 2 Apr 2014 16:05:41 +0000 (12:05 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 2 Apr 2014 16:05:41 +0000 (12:05 -0400)

Trivial merge