Merge proposals

quakespasm in Ubuntu has no merge proposals.