[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 19 Jul 2013 10:01:19 +0000 (12:01 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 19 Jul 2013 10:01:19 +0000 (12:01 +0200)
bzr revid: tde@openerp.com-20130719100119-ohpzxw4r1fxta93k

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

Simple merge