[MERGE] forward port of branch 7.0 up to f4870f8
[odoo/odoo.git] / win32 /
drwxr-xr-x   ..
-rw-r--r-- 3328 OpenERPServerService.py
-rw-r--r-- 2541 setup.py