]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBarry Warsaw <barry@python.org>
Tue, 25 Sep 2012 14:48:25 +0000 (10:48 -0400)
committerBarry Warsaw <barry@python.org>
Tue, 25 Sep 2012 14:48:25 +0000 (10:48 -0400)

Trivial merge