[MERGE] trunk
[odoo/odoo.git] / debian / local /
drwxr-xr-x   ..
-rw-r--r-- 1393 openerp-server.conf