]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 30 Mar 2014 21:16:18 +0000 (17:16 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 30 Mar 2014 21:16:18 +0000 (17:16 -0400)

Trivial merge