Merge pull request #369 from ShutterQuick/master+canextban

cs/quiet & cs/ban: Don't try to expand extbans

diff --cc include/phandler.h
Simple merge

diff --cc libathemecore/phandler.c
Simple merge

diff --cc modules/chanserv/quiet.c
Simple merge

diff --cc modules/protocol/charybdis.c
Simple merge

diff --cc modules/protocol/inspircd.c
Simple merge