Merge branch 'check-one-kline' of https://github.com/edk0/charybdis into edk0-check...

author Simon Arlott <sa.me.uk>

Sat, 31 Aug 2019 14:05:11 +0000 (15:05 +0100)

committer Simon Arlott <sa.me.uk>

Sat, 31 Aug 2019 14:05:11 +0000 (15:05 +0100)
author Simon Arlott <sa.me.uk>
Sat, 31 Aug 2019 14:05:11 +0000 (15:05 +0100)
committer Simon Arlott <sa.me.uk>
Sat, 31 Aug 2019 14:05:11 +0000 (15:05 +0100)
diff --cc doc/ircd.conf.example
Simple merge
diff --cc doc/reference.conf
Simple merge
author	Simon Arlott <sa.me.uk>
	Sat, 31 Aug 2019 14:05:11 +0000 (15:05 +0100)
committer	Simon Arlott <sa.me.uk>
	Sat, 31 Aug 2019 14:05:11 +0000 (15:05 +0100)
		1	2
doc/ircd.conf.example	patch \|	diff1 \|	diff2 \|	blob \| history
doc/reference.conf	patch \|	diff1 \|	diff2 \|	blob \| history