]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 20 Mar 2011 23:28:52 +0000 (00:28 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 20 Mar 2011 23:28:52 +0000 (00:28 +0100)

Trivial merge