]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 7 May 2011 17:48:40 +0000 (19:48 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 7 May 2011 17:48:40 +0000 (19:48 +0200)

Trivial merge