]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 21:05:51 +0000 (22:05 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 21:05:51 +0000 (22:05 +0100)

Trivial merge