]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3 (#17168)
authorBenjamin Peterson <benjamin@python.org>
Sat, 9 Feb 2013 13:57:53 +0000 (08:57 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 9 Feb 2013 13:57:53 +0000 (08:57 -0500)

Trivial merge