Merge proposals dependent on lp://qastaging/~tafaru/openobject-server/7.0-fix-996415

lp://qastaging/~tafaru/openobject-server/7.0-fix-996415 has no merge proposals.