]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Mon, 9 Jul 2012 20:09:21 +0000 (16:09 -0400)
committerBrett Cannon <brett@python.org>
Mon, 9 Jul 2012 20:09:21 +0000 (16:09 -0400)

Trivial merge