Merge proposals dependent on lp:~bryce/xchat-gnome/cherrypicks

lp:~bryce/xchat-gnome/cherrypicks has no merge proposals.