[MERGE] from trunk
authorchm@openerp.com <>
Wed, 26 Mar 2014 10:55:39 +0000 (11:55 +0100)
committerchm@openerp.com <>
Wed, 26 Mar 2014 10:55:39 +0000 (11:55 +0100)
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f

1  2 
addons/website/views/website_templates.xml
addons/website_report/views/layouts.xml