[MERGE] Forward-port of 7.0 bugfixes up to 7d3453d119a80f484918842682ac5f4299d91e7b
[odoo/odoo.git] / win32 /
drwxr-xr-x   ..
-rw-r--r-- 3328 OpenERPServerService.py
-rw-r--r-- 2541 setup.py