From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 16 Aug 2015 10:25:07 +0000 (+0200)
Subject: Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: Release_902~156^2~1^2~4
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=0475c981817d12900332693297a77a9ae7168129;hp=0475c981817d12900332693297a77a9ae7168129;p=citadel.git

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

Conflicts:
	citadel/citserver.c
	citadel/config.c
	citadel/control.c
	citadel/modules/fulltext/serv_fulltext.c
	citadel/modules/migrate/serv_migrate.c
	citadel/modules/upgrade/serv_upgrade.c
	citadel/server.h
---