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

Trivial merge