Merge proposals dependent on lp://staging/~zyga/checkbox/provider-manager-improvements

lp://staging/~zyga/checkbox/provider-manager-improvements has no merge proposals.