[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 11 Apr 2013 10:36:45 +0000 (12:36 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 11 Apr 2013 10:36:45 +0000 (12:36 +0200)
commitfe2ea997a2a317278610b7d0f462f7a1b01c5f35
tree16ff118484943daaa5a55a687ce15d5a2519c19d
parente3ac95411a3ce2cb885f85799b2f55f1528b9d96
parent748681e5d2b911638d5a01315c48ca48ae63ed41
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/mail/wizard/mail_compose_message.py