]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 2.6
authorBarry Warsaw <barry@python.org>
Tue, 21 Feb 2012 16:16:52 +0000 (11:16 -0500)
committerBarry Warsaw <barry@python.org>
Tue, 21 Feb 2012 16:16:52 +0000 (11:16 -0500)

Trivial merge