[MERGE] forward port of branch saas-5 up to a7c2125
authorChristophe Simonis <chs@odoo.com>
Tue, 10 Jun 2014 11:19:55 +0000 (13:19 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 10 Jun 2014 11:19:55 +0000 (13:19 +0200)
1  2 
addons/website/views/website_templates.xml