Merge proposals dependent on lp:~openerp-spain-team/openerp-spain/6.0-git

lp:~openerp-spain-team/openerp-spain/6.0-git has no merge proposals.