[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 16 Jul 2012 04:34:44 +0000 (10:04 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 16 Jul 2012 04:34:44 +0000 (10:04 +0530)
bzr revid: mdi@tinyerp.com-20120712043845-ing7eipsv3z20ps5
bzr revid: mdi@tinyerp.com-20120713044825-1wwxd80yp7cv2325
bzr revid: mdi@tinyerp.com-20120716043444-cfqjeo5rmnrj295x

1  2 
addons/crm/crm_lead_view.xml
addons/crm/res_partner_view.xml

Simple merge
Simple merge