[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 20 Sep 2012 12:59:38 +0000 (14:59 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 20 Sep 2012 12:59:38 +0000 (14:59 +0200)
commit91cd53954195dca5efbe134931d08f8bea13496e
tree1392865e006bdd372bbbb70d270253ae0fc6c467
parentdfa14420d212911bb5f87af19231a848c59cab07
parent5959a1f7a987b1349bc005df63570e530e0833ba
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120920125938-brd60c8kf6zpy20a
addons/mail/mail_message.py
addons/mail/static/src/js/mail.js
addons/mail/tests/test_mail.py