[MERGE] Merge with lp:openobject-addons
authorBhumika (OpenERP) <sbh@tinyerp.com>
Thu, 12 May 2011 05:01:43 +0000 (10:31 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Thu, 12 May 2011 05:01:43 +0000 (10:31 +0530)
bzr revid: sbh@tinyerp.com-20110512050143-5tbc55oop00ksr4u

1  2 
addons/crm/crm_lead.py
addons/crm/wizard/crm_lead_to_partner.py
addons/crm/wizard/crm_merge_opportunities.py
addons/crm_partner_assign/wizard/crm_forward_to_partner.py

Simple merge