Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

author Art Cancro <ajc@citadel.org>

Tue, 13 Nov 2018 21:36:22 +0000 (16:36 -0500)

committer Art Cancro <ajc@citadel.org>

Tue, 13 Nov 2018 21:36:22 +0000 (16:36 -0500)
author Art Cancro <ajc@citadel.org>
Tue, 13 Nov 2018 21:36:22 +0000 (16:36 -0500)
committer Art Cancro <ajc@citadel.org>
Tue, 13 Nov 2018 21:36:22 +0000 (16:36 -0500)
diff --cc citadel/Makefile.in
Simple merge
diff --cc citadel/include/citadel_dirs.h
Simple merge
diff --cc citadel/utillib/citadel_dirs.c
Simple merge
author	Art Cancro <ajc@citadel.org>
	Tue, 13 Nov 2018 21:36:22 +0000 (16:36 -0500)
committer	Art Cancro <ajc@citadel.org>
	Tue, 13 Nov 2018 21:36:22 +0000 (16:36 -0500)
		1	2
citadel/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
citadel/include/citadel_dirs.h	patch \|	diff1 \|	diff2 \|	blob \| history
citadel/utillib/citadel_dirs.c	patch \|	diff1 \|	diff2 \|	blob \| history