Merge branch 'master' of github.com:DALnet/bahamut into halfops

author Kobi Shmueli <redacted>

Fri, 28 Dec 2018 04:48:23 +0000 (06:48 +0200)

committer Kobi Shmueli <redacted>

Fri, 28 Dec 2018 04:48:23 +0000 (06:48 +0200)
author Kobi Shmueli <redacted>
Fri, 28 Dec 2018 04:48:23 +0000 (06:48 +0200)
committer Kobi Shmueli <redacted>
Fri, 28 Dec 2018 04:48:23 +0000 (06:48 +0200)
diff --cc include/struct.h
Simple merge
diff --cc src/channel.c
Simple merge
diff --cc src/m_services.c
Simple merge
diff --cc src/s_user.c
Simple merge
author	Kobi Shmueli <redacted>
	Fri, 28 Dec 2018 04:48:23 +0000 (06:48 +0200)
committer	Kobi Shmueli <redacted>
	Fri, 28 Dec 2018 04:48:23 +0000 (06:48 +0200)
		1	2
include/struct.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/channel.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/m_services.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/s_user.c	patch \|	diff1 \|	diff2 \|	blob \| history