Merge proposals

x11proto-xext in Ubuntu has no merge proposals.