Christine Dodrill 203523540b Merge remote-tracking branch 'origin/devel' ... Conflicts: CREDITS extra/services/atheme/elemental-ircd.c		2015-03-26 02:10:06 -07:00
..
elemental-ircd.c	Merge remote-tracking branch 'origin/devel'	2015-03-26 02:10:06 -07:00