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

Trivial merge