[MERGE] merge with main branch
authorAmit Vora <avo@tinyerp.com>
Fri, 28 Mar 2014 05:00:00 +0000 (10:30 +0530)
committerAmit Vora <avo@tinyerp.com>
Fri, 28 Mar 2014 05:00:00 +0000 (10:30 +0530)
bzr revid: avo@tinyerp.com-20140328050000-xmax3xa0dp4ltxxv

1  2 
addons/crm/crm_lead_view.xml

Simple merge