[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Tue, 21 May 2013 12:36:24 +0000 (14:36 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 21 May 2013 12:36:24 +0000 (14:36 +0200)
bzr revid: tde@openerp.com-20130521123624-u6cqs144rbuzrmpo

1  2 
addons/crm/crm_lead.py

Simple merge