[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2-stw
[odoo/odoo.git] / bin /
drwxr-xr-x   ..
-rwxr-xr-x 562 openerp-server.py