]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 11 Oct 2011 20:43:51 +0000 (22:43 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 11 Oct 2011 20:43:51 +0000 (22:43 +0200)

Trivial merge