[MERGE] Revisions 8997 ... 8999 of 7.0 branch.
authorThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 13:27:21 +0000 (15:27 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 13:27:21 +0000 (15:27 +0200)
commit0dada27fcd725291bc487e1f47434b0ddfef54b7
treea9e6dda35fd9e69c016d5b79bf7b8155f0e82091
parent71b245598ebc7754a916bf92f812b9a284246778
parenta75cc23573e375544feb81cc51a0300efe7c40bc
[MERGE] Revisions 8997 ... 8999 of 7.0 branch.

bzr revid: tde@openerp.com-20130426132721-02lkoc41fms9ve1k
addons/mail/mail_mail.py
addons/mail/mail_thread.py
addons/mail/static/src/js/mail.js
addons/mail/tests/test_mail_gateway.py