Merge proposals dependent on lp://qastaging/~openerp-community/openobject-server/stefan-therp_lp879872-6.1

lp://qastaging/~openerp-community/openobject-server/stefan-therp_lp879872-6.1 has no merge proposals.