[MERGE] Merged with main addons lp:~openerp/openobject-addons/trunk
[odoo/odoo.git] / openerp-web.cfg
1 [global]
2
3