Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-company-currency

lp:~openerp-dev/openobject-addons/trunk-company-currency has no merge proposals.