[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Mon, 26 Aug 2013 08:54:10 +0000 (10:54 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 26 Aug 2013 08:54:10 +0000 (10:54 +0200)
commit21d57f5e9dd02f539c108b2d60020b5bda8f1ef8
tree1142665e583816887b9ba0c229309926cbe53596
parent982915b7d09c63391a3e8dbed771c03319ef7b2f
parent7294b0ebfa056002fb2409f2b28057c05a3f328b
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130826085410-qngwkw6eyxol4192
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/mail/data/mail_data.xml
addons/mail/mail_thread.py