Merge branch 'bug152-AllowedChannelTypes'

* bug152-AllowedChannelTypes:
  Implement new configuration option "AllowedChannelTypes"
  Introduce "CHANTYPES" #define

diff --cc src/ngircd/conf.c
Simple merge

diff --cc src/ngircd/irc-channel.c
Simple merge

diff --cc src/ngircd/irc-info.c
Simple merge