Merge remote-tracking branch 'ophion/upstream/dnsbl-rename'

author Simon Arlott <sa.me.uk>

Thu, 9 Jul 2020 19:53:38 +0000 (20:53 +0100)

committer Simon Arlott <sa.me.uk>

Thu, 9 Jul 2020 19:53:38 +0000 (20:53 +0100)
author Simon Arlott <sa.me.uk>
Thu, 9 Jul 2020 19:53:38 +0000 (20:53 +0100)
committer Simon Arlott <sa.me.uk>
Thu, 9 Jul 2020 19:53:38 +0000 (20:53 +0100)
diff --cc doc/ircd.conf.example
Simple merge
diff --cc ircd/newconf.c
Simple merge
diff --cc ircd/s_conf.c
Simple merge
author	Simon Arlott <sa.me.uk>
	Thu, 9 Jul 2020 19:53:38 +0000 (20:53 +0100)
committer	Simon Arlott <sa.me.uk>
	Thu, 9 Jul 2020 19:53:38 +0000 (20:53 +0100)
		1	2
doc/ircd.conf.example	patch \|	diff1 \|	diff2 \|	blob \| history
ircd/newconf.c	patch \|	diff1 \|	diff2 \|	blob \| history
ircd/s_conf.c	patch \|	diff1 \|	diff2 \|	blob \| history