* Merged in code from the TRANSACTIONS branch for testing.

[citadel.git] / citadel / ChangeLog

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 9b6b32b94cecfb43c9cdf663aa414679eeefaaa7..28d07edc69fbbabd556dae4909a360f415cd5e9c 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.62  2001/01/09 05:39:45  ajc
+ * Merged in code from the TRANSACTIONS branch for testing.
+
  Revision 573.61  2000/12/30 06:17:17  ajc
  * Still more work on IMAP.  Damn this is tedious.
 
@@ -2259,3 +2262,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+