Merge proposals dependent on lp:~neon/kompare/master

lp:~neon/kompare/master has no merge proposals.