Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-bug-1253950-aja

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