]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 20 Mar 2011 16:42:55 +0000 (17:42 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 20 Mar 2011 16:42:55 +0000 (17:42 +0100)

Trivial merge