Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-bug-1157560-tpa

lp:~openerp-dev/openobject-server/trunk-bug-1157560-tpa has no merge proposals.