[MERGE] forward port of branch saas-3 up to revid faace84
authorChristophe Simonis <christophe@kn.gl>
Sun, 1 Jun 2014 08:56:39 +0000 (10:56 +0200)
committerChristophe Simonis <christophe@kn.gl>
Sun, 1 Jun 2014 08:56:39 +0000 (10:56 +0200)
commit36f9af78aa2f56ddba85fe22e812938c253d3f94
tree05a8315b220972fcd825b73797bb58fe6914b995
parent52501dde7a2a9d789deb743fd7a3d9df34b27da4
parentfaace8493d6aa4a2b2994d25495208766180f1cd
[MERGE] forward port of branch saas-3 up to revid faace84
addons/email_template/email_template.py