Merge proposals

up-imapproxy in Ubuntu has no merge proposals.