]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 5 Nov 2014 18:10:16 +0000 (13:10 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 5 Nov 2014 18:10:16 +0000 (13:10 -0500)

Trivial merge