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

Trivial merge