[MERGE] trunk
authorThibault Francois <tfr@openerp.com>
Thu, 7 Apr 2011 12:03:20 +0000 (14:03 +0200)
committerThibault Francois <tfr@openerp.com>
Thu, 7 Apr 2011 12:03:20 +0000 (14:03 +0200)
bzr revid: tfr@openerp.com-20110407120320-nbcd1egwuufx06su

1  2 
addons/crm/crm_lead.py

Simple merge