]> granicus.if.org Git - python/commitdiff
Merge from 3.2
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 26 Mar 2011 17:39:55 +0000 (18:39 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 26 Mar 2011 17:39:55 +0000 (18:39 +0100)

Trivial merge