Merge proposals dependent on lp://staging/~olivier-laurent/openobject-server/6.1-bug1157048

lp://staging/~olivier-laurent/openobject-server/6.1-bug1157048 has no merge proposals.