[MERGE] merge with main branch
authorAmit Vora (OpenERP) <voraamitr@gmail.com>
Wed, 26 Feb 2014 12:43:27 +0000 (18:13 +0530)
committerAmit Vora (OpenERP) <voraamitr@gmail.com>
Wed, 26 Feb 2014 12:43:27 +0000 (18:13 +0530)
bzr revid: voraamitr@gmail.com-20140226124327-lo0zdy3fztjvdtwk

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

Simple merge
Simple merge