[MERGE] Forward-port 7.0 up to 1b49a87
authorOlivier Dony <odo@openerp.com>
Fri, 10 Oct 2014 17:21:18 +0000 (19:21 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 10 Oct 2014 17:21:18 +0000 (19:21 +0200)
commitedd94b623eaf44f308daddba51e38c08ccd4e7b0
tree1adb10a3a10040bb27a93753a519ddbb715c762c
parentb13898c05806b4270578fe7234e79deda3a5539d
parent1b49a876196de1f4b6568ff1751f7c7c6b2d5002
[MERGE] Forward-port 7.0 up to 1b49a87
addons/mail/mail_thread.py
addons/mail/tests/test_mail_gateway.py
openerp/addons/base/ir/ir_mail_server.py
openerp/addons/base/res/res_users.py
openerp/tools/mail.py