Merge proposals

dnshistory in Ubuntu has no merge proposals.