[MERGE] merge with latest stable
[odoo/odoo.git] / pixmaps / openerp-icon.png
pixmaps/openerp-icon.png