]> granicus.if.org Git - python/commitdiff
merge closing of 2.5 branch
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 31 Oct 2011 11:40:25 +0000 (12:40 +0100)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 31 Oct 2011 11:40:25 +0000 (12:40 +0100)

Trivial merge