]> granicus.if.org Git - python/commitdiff
merge 2.7
authorBarry Warsaw <barry@python.org>
Tue, 21 Feb 2012 16:19:00 +0000 (11:19 -0500)
committerBarry Warsaw <barry@python.org>
Tue, 21 Feb 2012 16:19:00 +0000 (11:19 -0500)

Trivial merge