Merge proposals dependent on lp://qastaging/~georgeyk/stoqdrivers/scales

lp://qastaging/~georgeyk/stoqdrivers/scales has no merge proposals.