Merge proposals dependent on lp:~dcaro/clicompanion/fix-819038

lp:~dcaro/clicompanion/fix-819038 has no merge proposals.