]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 14 Jun 2016 06:41:40 +0000 (23:41 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 14 Jun 2016 06:41:40 +0000 (23:41 -0700)

Trivial merge