[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639...
[odoo/odoo.git] / openerp / cli /
drwxr-xr-x   ..
-rw-r--r-- 1554 __init__.py
-rw-r--r-- 10256 server.py