[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 4 Oct 2013 08:50:39 +0000 (10:50 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 4 Oct 2013 08:50:39 +0000 (10:50 +0200)
commit94887c5cb8c3d5054e588c6393447ad5fcf3fa2f
treee4820bffe88560d0cda28f492459d3ac360a2967
parent939a344a90e45add0f4e1dc1359c37e803d2455d
parent9e85aa3e729519034ef6b0b21443f08dea7cb40e
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
addons/mail/static/src/js/mail.js
addons/portal/portal_data.xml