]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Fri, 3 Feb 2012 17:08:32 +0000 (12:08 -0500)
committerBrett Cannon <brett@python.org>
Fri, 3 Feb 2012 17:08:32 +0000 (12:08 -0500)

Trivial merge