[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 12 May 2010 06:44:23 +0000 (12:14 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 12 May 2010 06:44:23 +0000 (12:14 +0530)
bzr revid: rpa@tinyerp.com-20100512064423-75gxtb5livda3429

1  2 
addons/crm/crm.py
addons/crm/crm_lead.py

Simple merge
Simple merge