]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorMartin v. Löwis <martin@v.loewis.de>
Tue, 13 Mar 2012 21:34:04 +0000 (14:34 -0700)
committerMartin v. Löwis <martin@v.loewis.de>
Tue, 13 Mar 2012 21:34:04 +0000 (14:34 -0700)

Trivial merge