Merge remote-tracking branch 'odoo/7.0' into 7.0
[odoo/odoo.git] / addons / web / static / src / xml /
drwxr-xr-x   ..
-rw-r--r-- 84429 base.xml