[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Tue, 22 May 2012 08:11:33 +0000 (10:11 +0200)
committerAntony Lesuisse <al@openerp.com>
Tue, 22 May 2012 08:11:33 +0000 (10:11 +0200)
bzr revid: al@openerp.com-20120522081133-tnio8mec7ptyzt3n

1  2 
addons/crm/crm_lead_view.xml

Simple merge