Merge proposals dependent on lp://staging/~gergagabriel/stoqlib/bug4040

lp://staging/~gergagabriel/stoqlib/bug4040 has no merge proposals.