[MERGE] Sync with trunk, to benefit from freshly forward-ported 7.0 bugfixes.
authorThibault Delavallée <tde@openerp.com>
Thu, 11 Apr 2013 14:11:58 +0000 (16:11 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 11 Apr 2013 14:11:58 +0000 (16:11 +0200)
commitf35246e81cc4161e52c427b6dbb7e37ed8c57d82
tree3b0b8b91c3bde9ef64f83f8a91f92a114e151e0e
parentf74248679fafae2a9dd4b079e7f9c94d7ee3aaab
parent4c4c48dc72024d92edc26ebb5885f41d5b10eb9d
[MERGE] Sync with trunk, to benefit from freshly forward-ported 7.0 bugfixes.

bzr revid: tde@openerp.com-20130411082704-qce7e1moyo2sxz0c
bzr revid: tde@openerp.com-20130411141158-lk7lsf2haqbjit1u
addons/mail/mail_alias.py
addons/mail/mail_thread.py
addons/mail/tests/test_mail_gateway.py