[MERGE] merge from trunk
[odoo/odoo.git] / addons / crm / security /
drwxr-xr-x   ..
-rw-r--r-- 5020 crm_security.xml
-rw-r--r-- 3945 ir.model.access.csv