Merge proposals dependent on lp:~openerp-dev/openobject-server/6.0-opw-50912-skh

lp:~openerp-dev/openobject-server/6.0-opw-50912-skh has no merge proposals.