]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 22:47:26 +0000 (17:47 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 22:47:26 +0000 (17:47 -0500)

Trivial merge