Merge proposals dependent on lp:openupgrade-server/6.0

lp:openupgrade-server/6.0 has no merge proposals.