[MERGE] Forward-port saas-3 up to e79a367
authorOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 10:54:30 +0000 (12:54 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 10:54:30 +0000 (12:54 +0200)
commit8b15482e0037b2484e993ffaf9e5691662c99e28
tree93d2d28c1b4d67f4f258570b442d17f67665d569
parent29cdfc62a79db6b1ef1806369cd5c52f6c8a65f4
parente79a3675d13eacfd3d38e9725bbb354c778f0252
[MERGE] Forward-port saas-3 up to e79a367
addons/mail/mail_thread.py
openerp/osv/orm.py