]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (closes #22200)
authorBenjamin Peterson <benjamin@python.org>
Mon, 18 Aug 2014 04:01:33 +0000 (23:01 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 18 Aug 2014 04:01:33 +0000 (23:01 -0500)

Trivial merge