Merge proposals dependent on lp://staging/~stoq-dev/stoq/master

lp://staging/~stoq-dev/stoq/master has no merge proposals.