[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Wed, 17 Jul 2013 07:47:10 +0000 (09:47 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 17 Jul 2013 07:47:10 +0000 (09:47 +0200)
commit32d0f6bce086e10bf31f3a326503e45b0f4d9ff0
tree80a2fa08c867b237560e28547db4edbae8c882a3
parent318faddaa91a9d654fcaec4d4b4e6a3f65862d9e
parent7c4f374acac9b198e93b43cc6c242a2117966802
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij
addons/mail/__openerp__.py
addons/mail/mail_message.py
addons/mail/static/src/css/mail.css
addons/mail/static/src/js/mail.js
addons/mail/static/src/xml/mail.xml