[MERGE] Sync with trunnk
authorThibault Delavallée <tde@openerp.com>
Fri, 21 Feb 2014 14:57:16 +0000 (15:57 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 21 Feb 2014 14:57:16 +0000 (15:57 +0100)
commit4a284821b4189c45e6acd6a62aeb26b8c21d167d
treebd38324f5b36470a1df93af83d260950789f1b46
parent1ac8e7cdfddbf8ac6b7c4b843582392705f10a73
parentd7c974aa5b5a7c92dcfc11af90db3adef5264eb9
[MERGE] Sync with trunnk

bzr revid: tde@openerp.com-20140221145716-vkusdgd56rnc85rl
addons/mail/static/src/js/mail.js
addons/mail/wizard/mail_compose_message.py