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