[MERGE]: Merge with lp:openobject-server
[odoo/odoo.git] / bin /
drwxr-xr-x   ..
-rwxr-xr-x 562 openerp-server.py