[MERGE] merge with main branch
authorAmit Vora <avo@tinyerp.com>
Thu, 13 Mar 2014 12:48:45 +0000 (18:18 +0530)
committerAmit Vora <avo@tinyerp.com>
Thu, 13 Mar 2014 12:48:45 +0000 (18:18 +0530)
commit2a50034bfcb897445161c142d7c8e387b18a4ea2
tree8ac42c08b4d9e3e13819f0591db5c2e942063f3e
parent2a732812817755cec4a11da05e0b52fcf142f1a7
parentb92001f1d8759d6695ab2e2b19d8a41d2e859b6c
[MERGE] merge with main branch

bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml