]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 20 Jan 2013 15:09:51 +0000 (10:09 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 20 Jan 2013 15:09:51 +0000 (10:09 -0500)

Trivial merge