Merge proposals dependent on lp:~aauzi/midori/fix-1179200-4

lp:~aauzi/midori/fix-1179200-4 has no merge proposals.