[MERGE]: MERGE with lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm
[odoo/odoo.git] / bin /
drwxr-xr-x   ..
drwxr-xr-x - addons
-rwxr-xr-x 565 openerp-server.py