[MERGE]: Merge with branch lp:~openerp-dev/openobject-addons/emails-framework-addons
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Fri, 29 Apr 2011 09:59:47 +0000 (15:29 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Fri, 29 Apr 2011 09:59:47 +0000 (15:29 +0530)
commit76b0bb0137131902fca90a0256243abf3d712053
tree52befb6740402916b228affa2a0576f207cfc234
parentc5dfa76ce34fd92c8e6c27873b1fd8e56e93d595
parent5be7bbd5c372ead0a75ac2192a0d942d549b1c4b
[MERGE]: Merge with branch lp:~openerp-dev/openobject-addons/emails-framework-addons

bzr revid: rha@tinyerp.com-20110429095947-ccy7mtkxya1ssq5f
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/crm/wizard/crm_lead_to_opportunity.py
addons/mail/email_message.py
addons/mail/email_thread.py