]> granicus.if.org Git - python/commitdiff
Merge with 3.2
authorMartin v. Löwis <martin@v.loewis.de>
Sat, 25 Feb 2012 09:47:30 +0000 (10:47 +0100)
committerMartin v. Löwis <martin@v.loewis.de>
Sat, 25 Feb 2012 09:47:30 +0000 (10:47 +0100)

Trivial merge