[CMF-checkins] CVS: CMF - CHANGES.txt:1.107.2.49

[Florent Guillaume]

Update of /cvs-repository/CMF
In directory cvs.zope.org:/tmp/cvs-serv9304

Modified Files:
      Tag: CMF-1_3-branch
	CHANGES.txt 
Log Message:
Merge from 1.4 branch: don't swallow ConflictError during wrapUser.


=== CMF/CHANGES.txt 1.107.2.48 => 1.107.2.49 ===
--- CMF/CHANGES.txt:1.107.2.48	Mon Oct 27 11:58:32 2003
+++ CMF/CHANGES.txt	Thu Jan 29 12:35:45 2004
@@ -1,3 +1,9 @@
+CMF 1.3.3+ (unreleased)
+
+  Bug Fixes
+
+    - CMFCore.MembershipTool: Don't swallow ConflictError during wrapUser.
+
 CMF 1.3.3 (2003/10/26)
 
   Bug Fixes