Fix things
Merge branch 'master' of https://github.com/Th0masR0ss/XChat