]> granicus.if.org Git - python/commitdiff
merge 3.2
authorMartin v. Löwis <martin@v.loewis.de>
Sat, 24 Mar 2012 16:40:50 +0000 (17:40 +0100)
committerMartin v. Löwis <martin@v.loewis.de>
Sat, 24 Mar 2012 16:40:50 +0000 (17:40 +0100)

Trivial merge