[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)
commitaed639f6d103bc63ad4d4f70ff16f9bd3bc66771
tree6cf11aadfbbea4dcb89da2eb65ee6acceba82c3d
parentd3cf56864910d8f27a55bf8acb2f6619756e5b4a
parentb86d62a29737d1c6a213656c3248b41e870c0671
[MERGE] from trunk

bzr revid: chm@openerp.com-20130522100239-sbkwtitaxy8hj1cx
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/sale_crm/sale_crm_view.xml