]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 6 Apr 2012 16:54:57 +0000 (12:54 -0400)
committerBrett Cannon <brett@python.org>
Fri, 6 Apr 2012 16:54:57 +0000 (12:54 -0400)

Trivial merge