]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 3 Jan 2012 21:49:56 +0000 (22:49 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 3 Jan 2012 21:49:56 +0000 (22:49 +0100)

Trivial merge