]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 27 Apr 2012 19:31:45 +0000 (15:31 -0400)
committerBrett Cannon <brett@python.org>
Fri, 27 Apr 2012 19:31:45 +0000 (15:31 -0400)

Trivial merge