]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 2 Apr 2014 19:52:04 +0000 (15:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 2 Apr 2014 19:52:04 +0000 (15:52 -0400)

Trivial merge