]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null merge from 2.6
authorBarry Warsaw <barry@python.org>
Mon, 20 Feb 2012 19:44:26 +0000 (14:44 -0500)
committerBarry Warsaw <barry@python.org>
Mon, 20 Feb 2012 19:44:26 +0000 (14:44 -0500)

Trivial merge