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

Trivial merge