[MERGE] from trunk-openchatter-chm
authorChristophe Matthieu <chm@openerp.com>
Mon, 1 Oct 2012 11:06:45 +0000 (13:06 +0200)
committerChristophe Matthieu <chm@openerp.com>
Mon, 1 Oct 2012 11:06:45 +0000 (13:06 +0200)
commit85c05bcbb8550eabecd0ea762fc31ead821713fd
tree5b2a3e871c6f5b91cd2420bf5d991ccdcb7c3d8a
parentd9c3a5ff0d6f7bf80b01999cf558865a3381e64b
parentcb287a1964224883076519b057a52ccd25a9772b
[MERGE] from trunk-openchatter-chm

bzr revid: chm@openerp.com-20121001110645-ydpqtagjcczheff1
addons/mail/static/src/js/mail.js