Merge proposals dependent on lp://qastaging/gajim

lp://qastaging/gajim has no merge proposals.