Merge branch 'master' into IOMultiplexer

diff --cc src/ClientSocket.h
Simple merge

diff --cc src/IRCParser.c
Simple merge

diff --cc src/modules/DummyServ.mod/bot_DummyServ.c
Simple merge

diff --cc src/modules/NeonBackup.mod/bot_NeonBackup.c
Simple merge

diff --cc src/modules/NeonFun.mod/bot_NeonFun.c
Simple merge

diff --cc src/modules/NeonHelp.mod/bot_NeonHelp.c
Simple merge

diff --cc src/modules/NeonServ.mod/bot_NeonServ.c
Simple merge

diff --cc src/modules/NeonSpam.mod/bot_NeonSpam.c
Simple merge