]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 1 Feb 2013 21:36:49 +0000 (16:36 -0500)
committerBrett Cannon <brett@python.org>
Fri, 1 Feb 2013 21:36:49 +0000 (16:36 -0500)

Trivial merge