]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Nov 2011 19:36:51 +0000 (20:36 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Nov 2011 19:36:51 +0000 (20:36 +0100)

Trivial merge