[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)
commit37e5b6aa27dde141bd064e3a7743b2332a3f29bd
tree18072d7a6206b02ba3bf8b8fa836a3f2a1459d06
parent26f64c51f3e5534a827b80c345ba702349c1aee3
parentdd1a492aba8d823ae381f96b188aa84113e16390
[MERGE] trunk

bzr revid: tfr@openerp.com-20110627094420-4hgyyo72orq3dp0u
addons/crm/crm.py
addons/crm/crm_lead.py
addons/crm/crm_phonecall.py
addons/crm/wizard/crm_merge_opportunities.py