[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439...
[odoo/odoo.git] / addons / website / data /
drwxr-xr-x   ..
-rw-r--r-- 8916 website_data.xml
-rw-r--r-- 5597 website_demo.xml