Merge proposals

xringd in Ubuntu has no merge proposals.