]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Tue, 1 Jan 2013 03:44:06 +0000 (21:44 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 1 Jan 2013 03:44:06 +0000 (21:44 -0600)

Trivial merge