[MERGE] merged with main trunk
[odoo/odoo.git] / openerp-web.cfg
1 [global]
2
3