]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#21174)
authorBenjamin Peterson <benjamin@python.org>
Mon, 7 Apr 2014 23:35:36 +0000 (19:35 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 7 Apr 2014 23:35:36 +0000 (19:35 -0400)

Trivial merge