]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:05:09 +0000 (12:05 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:05:09 +0000 (12:05 -0400)

Trivial merge