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

[Yvo Schubbe]

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

Modified Files:
	CHANGES.txt 
Log Message:
Merged yuppie-collector119and201-branch:
- Fixed acquisition bug in getDiscussionFor. (Collector #119)
- Fixed acquisition bug in overrideDiscussionFor. (Collector #201)
- Some related cleanup.


=== CMF/CHANGES.txt 1.206 => 1.207 ===
--- CMF/CHANGES.txt:1.206	Fri Jul  9 15:28:40 2004
+++ CMF/CHANGES.txt	Tue Jul 13 14:21:24 2004
@@ -1,3 +1,10 @@
+CMF 1.5.0-beta (unreleased)
+
+  Bug Fixes
+
+    - DiscussionTool: Fixed two acquisition bugs.
+      (Collector #119 and #201)
+
 CMF 1.5.0-alpha (2004/07/09)
 
   New Features
@@ -13,8 +20,8 @@
       set redirect depending on the selected button. If redirect is not set,
       the script calls a template and returns the resulting HTML page.
 
-    - ActionProviderBase, ActionInformation: Added methods to modify/edit 
-      actions. New method 'getActionObject' in 'ActionProviderBase' and 
+    - ActionProviderBase, ActionInformation: Added methods to modify/edit
+      actions. New method 'getActionObject' in 'ActionProviderBase' and
       'edit' method in 'ActionInformation' (Collector 195).
       An action now may be modified/edited the following way::