[MERGE] merge with main branch
authorAmit Vora (OpenERP) <voraamitr@gmail.com>
Fri, 7 Mar 2014 11:09:20 +0000 (16:39 +0530)
committerAmit Vora (OpenERP) <voraamitr@gmail.com>
Fri, 7 Mar 2014 11:09:20 +0000 (16:39 +0530)
bzr revid: voraamitr@gmail.com-20140307110920-nx2pxsocj8yx4nxn

1  2 
addons/crm/crm_lead_view.xml

Simple merge