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