]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Tue, 7 Feb 2012 14:20:20 +0000 (09:20 -0500)
committerBrett Cannon <brett@python.org>
Tue, 7 Feb 2012 14:20:20 +0000 (09:20 -0500)

Trivial merge