[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)
commit61702ad635bab4c86fe0b213219f66cfa9f453ea
tree58727b84629b4452c40905d51685b52b37787f67
parent168ca32323c33b185e075a139b8a0e83b9680b15
parent2ab61cf001fab1d30050598931bfa39956cf4883
[MERGE] merge with main branch

bzr revid: voraamitr@gmail.com-20140226124327-lo0zdy3fztjvdtwk
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml