Merge proposals dependent on lp:~openerp-dev/openobject-server/6.0-case-4492-jma

lp:~openerp-dev/openobject-server/6.0-case-4492-jma has no merge proposals.