]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 20 Apr 2015 03:14:57 +0000 (23:14 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 20 Apr 2015 03:14:57 +0000 (23:14 -0400)

Trivial merge