Accidentally merged the configdb branch into master. Reverting.
authorArt Cancro <ajc@uncensored.citadel.org>
Thu, 7 May 2015 11:17:54 +0000 (07:17 -0400)
committerArt Cancro <ajc@uncensored.citadel.org>
Thu, 7 May 2015 11:17:54 +0000 (07:17 -0400)
commit4db4fc48793f3680c5defd28ea32c97044a2b569
tree50e7a1e0077d5afab001cab9301fd4b341d88652
parent15054b0f11409cfc68102560fe4ab5a4e2bf4ea0
Accidentally merged the configdb branch into   Reverting.

This reverts commit 15054b0f11409cfc68102560fe4ab5a4e2bf4ea0, reversing
changes made to 1d738ab06a5394f604de22f816b87efaa6f2563a.
68 files changed:
citadel/citserver.c
citadel/citserver.h
citadel/config.c
citadel/config.h
citadel/context.c
citadel/control.c
citadel/database.c
citadel/event_client.c
citadel/ical_dezonify.c
citadel/include/ctdl_module.h
citadel/internet_addressing.c
citadel/journaling.c
citadel/ldap.c
citadel/modules/autocompletion/serv_autocompletion.c
citadel/modules/bio/serv_bio.c
citadel/modules/calendar/serv_calendar.c
citadel/modules/crypto/serv_crypto.c
citadel/modules/ctdlproto/serv_file.c
citadel/modules/ctdlproto/serv_messages.c
citadel/modules/ctdlproto/serv_rooms.c
citadel/modules/ctdlproto/serv_session.c
citadel/modules/ctdlproto/serv_user.c
citadel/modules/eventclient/serv_eventclient.c
citadel/modules/expire/expire_policy.c
citadel/modules/expire/serv_expire.c
citadel/modules/extnotify/extnotify_main.c
citadel/modules/extnotify/funambol65.c
citadel/modules/fulltext/serv_fulltext.c
citadel/modules/imap/imap_fetch.c
citadel/modules/imap/imap_misc.c
citadel/modules/imap/imap_search.c
citadel/modules/imap/serv_imap.c
citadel/modules/instmsg/serv_instmsg.c
citadel/modules/managesieve/serv_managesieve.c
citadel/modules/migrate/serv_migrate.c
citadel/modules/mrtg/serv_mrtg.c
citadel/modules/network/serv_netmail.c
citadel/modules/network/serv_netspool.c
citadel/modules/network/serv_network.c
citadel/modules/networkclient/serv_networkclient.c
citadel/modules/nntp/serv_nntp.c
citadel/modules/openid/serv_openid_rp.c
citadel/modules/pop3/serv_pop3.c
citadel/modules/pop3client/serv_pop3client.c
citadel/modules/rssclient/serv_rssclient.c
citadel/modules/sieve/serv_sieve.c
citadel/modules/smtp/serv_smtp.c
citadel/modules/smtp/serv_smtpqueue.c
citadel/modules/smtp/smtp_clienthandlers.c
citadel/modules/smtp/smtp_util.c
citadel/modules/spam/serv_spam.c
citadel/modules/upgrade/serv_upgrade.c
citadel/modules/vcard/serv_vcard.c
citadel/modules/wiki/serv_wiki.c
citadel/modules/xmpp/serv_xmpp.c
citadel/modules/xmpp/xmpp_presence.c
citadel/modules/xmpp/xmpp_query_namespace.c
citadel/msgbase.c
citadel/netconfig.c
citadel/parsedate.c
citadel/room_ops.c
citadel/serv_extensions.c
citadel/server.h
citadel/server_main.c
citadel/sysdep.c
citadel/threads.c
citadel/user_ops.c
citadel/utils/setup.c