[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 16 Oct 2012 07:57:48 +0000 (09:57 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 16 Oct 2012 07:57:48 +0000 (09:57 +0200)
commit971f1e90403bc0d044c5594f15997eca277d02cd
treec12d4ef8520030be86f57447380d5f6b53c9d1e4
parente72afca929d3be92f6fa19917aa7b8046bbfc4e1
parentdaa7ed0fb52a3fc195eaf370f0376bfbdbe3352f
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20121016075748-x2kaetainnngc11v
addons/mail/static/src/js/mail.js