[MERGE] Sync with trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Fri, 11 Apr 2014 14:28:17 +0000 (16:28 +0200)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Fri, 11 Apr 2014 14:28:17 +0000 (16:28 +0200)
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k

1  2 
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml

Simple merge
Simple merge