[MERGE] latest trunk
[odoo/odoo.git] / openerp / addons / base / security /
drwxr-xr-x   ..
-rw-r--r-- 2833 base_security.xml
-rw-r--r-- 13731 ir.model.access.csv