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