Merge proposals dependent on lp:openerp-usa

lp:openerp-usa has no merge proposals.