[MERGE] branch merged with trunk-menus-improvements-warehouse-jap
[odoo/odoo.git] / openerp-web.cfg
1 [global]
2
3