[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)
commit99ac3ff81b206b3cf0454402049d1120f8aa378c
tree5b0ff822c76597487521c6feed9051bc79ecac82
parent62814f9c2331340a5721331d652b0fdc0d2a201d
parent0d4d9af5f4b7ca695e33af370848350b437c132e
[MERGE] from trunk

bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
addons/website/views/website_templates.xml
addons/website_report/views/layouts.xml