]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 20 Dec 2011 13:00:12 +0000 (14:00 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 20 Dec 2011 13:00:12 +0000 (14:00 +0100)

Trivial merge