------------------------------------------------------------------------ r8368 | davew | 2010-02-23 13:12:54 -0500 (Tue, 23 Feb 2010) | 1 line Changed paths: M /branches/citadel_context_rework/include/ctdl_module.h D /branches/citadel_context_rework/modules/jabber A /branches/citadel_context_rework/modules/xmpp (from /trunk/citadel/modules/xmpp:8367) M /branches/citadel_context_rework/user_ops.c M /branches/citadel_context_rework/user_ops.h
Merged HEAD again ------------------------------------------------------------------------
