]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 6 Nov 2014 05:53:18 +0000 (00:53 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 6 Nov 2014 05:53:18 +0000 (00:53 -0500)

Trivial merge