[merge]: merging with the same branch
[odoo/odoo.git] / pixmaps / openerp-header.png
pixmaps/openerp-header.png