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)
commit24ea151a37782416b340a41dd41568fd1cf8b1bb
treeac7542598ec5307daeede4ff8cb03e2e4aba49f9
parent9d2cf73253089464ec06c23e029ea74be5655a35
parent7c4f374acac9b198e93b43cc6c242a2117966802
merge upstream

bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044
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