[MERGE,IMP] Merge with mma branch with some improvment
[odoo/odoo.git] / bin /
drwxr-xr-x   ..
-rwxr-xr-x 562 openerp-server.py