[MERGE] Syn with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 6 Sep 2013 08:15:34 +0000 (10:15 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 6 Sep 2013 08:15:34 +0000 (10:15 +0200)
bzr revid: tde@openerp.com-20130906081534-n273weq3h1fvfh2b

1  2 
addons/crm/crm_case_section_view.xml
addons/crm/crm_lead_view.xml
addons/mail/mail_message.py
addons/mail/wizard/mail_compose_message.py
addons/sale_crm/sale_crm_view.xml

Simple merge
Simple merge
Simple merge
Simple merge