]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 09:05:12 +0000 (02:05 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 09:05:12 +0000 (02:05 -0700)

Trivial merge