[MERGE] merged trunk.
[odoo/odoo.git] / openerp / addons / base / security /
drwxr-xr-x   ..
-rw-r--r-- 4090 base_security.xml
-rw-r--r-- 472 ir.model.access-1.csv
-rw-r--r-- 12812 ir.model.access.csv