]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 4 May 2012 20:04:59 +0000 (16:04 -0400)
committerBrett Cannon <brett@python.org>
Fri, 4 May 2012 20:04:59 +0000 (16:04 -0400)

Trivial merge