Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-bug-925361-odo

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