merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 17 Jul 2013 14:29:47 +0000 (16:29 +0200)
committerChristophe Simonis <chs@openerp.com>
Wed, 17 Jul 2013 14:29:47 +0000 (16:29 +0200)
bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044

1  2 
addons/crm/crm_lead.py
addons/crm/wizard/crm_lead_to_opportunity.py
addons/crm/wizard/crm_lead_to_opportunity_view.xml
addons/crm/wizard/crm_merge_opportunities_view.xml

Simple merge