[MERGE] from trunk
[odoo/odoo.git] / addons / product / security /
drwxr-xr-x   ..
-rw-r--r-- 2197 ir.model.access.csv
-rw-r--r-- 4012 product_security.xml