[MERGE] Sync with trunk-website-al
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 28 Jan 2014 12:53:40 +0000 (13:53 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 28 Jan 2014 12:53:40 +0000 (13:53 +0100)
commitc43fff56276b6a6c635b4c1c79cb585062a4bc3b
treeb629d98ce0c842e247efe6f942a4ecbbc2cf561d
parentb3ba8d0cb47700ad898271ac99562dc03ead5e62
parent8643d2fb871c8f0882661973a6e0a50dccabfb68
[MERGE] Sync with trunk-website-al

bzr revid: rim@openerp.com-20140128125340-j6ennyh75o2js7e9
addons/website/views/website_templates.xml