[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
[odoo/odoo.git] / pixmaps / openerp-icon.png
pixmaps/openerp-icon.png