]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Thu, 15 Nov 2012 21:13:00 +0000 (16:13 -0500)
committerBrett Cannon <brett@python.org>
Thu, 15 Nov 2012 21:13:00 +0000 (16:13 -0500)

Trivial merge