[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
[odoo/odoo.git] / addons / stock / security /
drwxr-xr-x   ..
-rw-r--r-- 7827 ir.model.access.csv
-rw-r--r-- 2932 stock_security.xml