[MERGE] Sync with trunk-website-al
authorRichard Mathot (OpenERP) <rim@openerp.com>
Fri, 24 Jan 2014 08:10:35 +0000 (09:10 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Fri, 24 Jan 2014 08:10:35 +0000 (09:10 +0100)
commit8e11708bd18cd9d7a637207b169acc350b5af238
tree34a1560c93c6da760a9f6e7e2c61d393ddf4d5f9
parent04870c93b41569a73acf69c6f118f096eb2e6e07
parentf45e0198a5a25527235f27ac5000b94c752650f3
[MERGE] Sync with trunk-website-al

bzr revid: rim@openerp.com-20140124081035-h2tgo573na68vadi
addons/website/views/website_templates.xml