Merge proposals dependent on lp://staging/~camptocamp/openerp-swiss-localization/6.1-refactoring-bvr-mako

lp://staging/~camptocamp/openerp-swiss-localization/6.1-refactoring-bvr-mako has no merge proposals.