[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)
commitccdae747a06a93fdc9c9ac39651131db1299375b
treec5325ec840598c8e3bc307b687575460d54b9d1c
parent7f9302a2f0f6750d275fd51ea8e9af8f55c68b2d
parenta7c212573526436553505eeebec2069e60fd5f32
[MERGE] forward port of branch saas-5 up to a7c2125
addons/website/views/website_templates.xml