[MERGE] Merge with trunk upto revision no 1184.
[odoo/odoo.git] / openerp-web.cfg
1 [global]
2
3