[MERGE] forward port of branch 7.0 up to 75d3ea6
authorChristophe Simonis <chs@odoo.com>
Tue, 14 Oct 2014 12:36:45 +0000 (14:36 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 14 Oct 2014 12:36:45 +0000 (14:36 +0200)
commitdb759948ffdda5f73eaa989a6b14f291b9a8f9b8
treeca52f753c9fb29379b7b0a14e2c5bf933976487d
parent695935253a2148d2d60f37264db90dbbdb41f963
parent75d3ea6208a8495610e1ba9ade93eee057222dc7
[MERGE] forward port of branch 7.0 up to 75d3ea6
addons/email_template/email_template.py
addons/web/static/src/js/view_form.js