]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 4 Oct 2011 17:11:34 +0000 (19:11 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 4 Oct 2011 17:11:34 +0000 (19:11 +0200)

Trivial merge