Merge remote-tracking branch 'odoo/7.0' into 7.0
[odoo/odoo.git] / win32 /
drwxr-xr-x   ..
-rw-r--r-- 3328 OpenERPServerService.py
-rw-r--r-- 2541 setup.py