Merge proposals dependent on lp:~openerp-dev/openerp-web/7.0-opw-597162-acl

lp:~openerp-dev/openerp-web/7.0-opw-597162-acl has no merge proposals.