[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Wed, 22 May 2013 10:02:39 +0000 (12:02 +0200)
committerChristophe Matthieu <chm@openerp.com>
Wed, 22 May 2013 10:02:39 +0000 (12:02 +0200)
bzr revid: chm@openerp.com-20130522100239-sbkwtitaxy8hj1cx

1  2 
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/sale_crm/sale_crm_view.xml

Simple merge
Simple merge
Simple merge