Merge proposals dependent on lp://qastaging/~laureote-loic/openerp/trunk

lp://qastaging/~laureote-loic/openerp/trunk has no merge proposals.