Merge branch 'ScrubCTCP'
authorAlexander Barton <alex@barton.de>
Sun, 26 Jun 2011 13:38:53 +0000 (15:38 +0200)
committerAlexander Barton <alex@barton.de>
Sun, 26 Jun 2011 13:38:53 +0000 (15:38 +0200)
commit269310f04b7624675f0e609a18c645474d9e5c6f
tree263d09618eb1be5d02a9a52e512f51060a17699e
parent3282c1325e491f2fbc7ee388c557f40e1f9eaed6
parent5410d96748bbc93fa9479ddaad0fffc51d816f92
Merge branch 'ScrubCTCP'

* ScrubCTCP:
  Add documentation for "ScrubCTCP" configuration option
  New option to scrub incoming CTCP commands
doc/sample-ngircd.conf.tmpl
man/ngircd.conf.5.tmpl
src/ngircd/conf.c