[MERGE] trunk
authortfr@openerp.com <>
Mon, 27 Jun 2011 09:44:20 +0000 (11:44 +0200)
committertfr@openerp.com <>
Mon, 27 Jun 2011 09:44:20 +0000 (11:44 +0200)
bzr revid: tfr@openerp.com-20110627094420-4hgyyo72orq3dp0u

1  2 
addons/crm/crm.py
addons/crm/crm_lead.py
addons/crm/crm_phonecall.py
addons/crm/wizard/crm_merge_opportunities.py

Simple merge
Simple merge
Simple merge