[MERGE] [CHERRYPICK] Backport of revision 4879 of saas-1 branch.
[odoo/odoo.git] / openerp / cli /
drwxr-xr-x   ..
-rw-r--r-- 1554 __init__.py
-rw-r--r-- 9254 server.py