[MERGE] Forward-port saas-4 up to 5ceded9
[odoo/odoo.git] / openerp / addons / base / security /
drwxr-xr-x   ..
-rw-r--r-- 4928 base_security.xml
-rw-r--r-- 12350 ir.model.access.csv