]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 5 Jul 2015 03:53:37 +0000 (22:53 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 5 Jul 2015 03:53:37 +0000 (22:53 -0500)

Trivial merge