]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Fri, 15 Jun 2012 23:04:29 +0000 (19:04 -0400)
committerBrett Cannon <brett@python.org>
Fri, 15 Jun 2012 23:04:29 +0000 (19:04 -0400)

Trivial merge