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
..
runit	Dockerfile: change to use deis/init	2014-08-09 21:54:07 -07:00
services	Merge remote-tracking branch 'origin/devel'	2015-03-26 02:10:06 -07:00