]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Tue, 31 Jan 2012 19:58:07 +0000 (14:58 -0500)
committerBrett Cannon <brett@python.org>
Tue, 31 Jan 2012 19:58:07 +0000 (14:58 -0500)

Trivial merge