OpenERP

Merge proposals dependent on lp://qastaging/~sistheo/openerp/openerp-openoffice-export

  1. openerp-openoffice-export
  2. Dependent merge proposals

lp://qastaging/~sistheo/openerp/openerp-openoffice-export has no merge proposals.