]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Fri, 20 Jul 2012 18:22:27 +0000 (14:22 -0400)
committerBrett Cannon <brett@python.org>
Fri, 20 Jul 2012 18:22:27 +0000 (14:22 -0400)

Trivial merge