[MERGE]: Merge with latest trunk-server
[odoo/odoo.git] / openerp / wizard /
drwxr-xr-x   ..
-rw-r--r-- 8402 __init__.py