[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / mrp / security /
drwxr-xr-x   ..
-rwxr-xr-x 11515 ir.model.access.csv
-rwxr-xr-x 1863 mrp_security.xml