[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)
commitb1e0f9f6f2c845de9837b6936d1cea0cb9554ce1
tree407b19ee44e259a7484172480e694b0101496734
parentc08b877370b24410bd33fad6d56899aa2eb6a7a2
parentd51cf606167f870bb6be260ef494fc96dea05b09
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130521123624-u6cqs144rbuzrmpo
addons/crm/crm_lead.py