[MERGE] from trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 22 Apr 2014 13:36:50 +0000 (15:36 +0200)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 22 Apr 2014 13:36:50 +0000 (15:36 +0200)
bzr revid: rim@openerp.com-20140422133650-bi5lri33o5f0g3yj

1  2 
addons/crm/crm_lead_view.xml

Simple merge