[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349...
[odoo/odoo.git] / win32 /
drwxr-xr-x   ..
-rw-r--r-- 3328 OpenERPServerService.py
-rw-r--r-- 2541 setup.py