[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)
bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q

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

Simple merge
Simple merge