[Zope-Checkins] CVS: Releases/Zope/doc - CHANGES.txt:1.360

[Andreas Jung]

Update of /cvs-repository/Releases/Zope/doc
In directory cvs.zope.org:/tmp/cvs-serv28503/doc

Modified Files:
	CHANGES.txt 
Log Message:


=== Releases/Zope/doc/CHANGES.txt 1.359 => 1.360 ===
           can select whether passwords are stored encrypted.
 
+        - Locale support in STXNG has been broken (since 2.4.0)
+
 
     Bugs fixed
 
@@ -83,7 +85,11 @@
           the level parameter inside a query overrides the optional 
           'level' parameter for a complete search request.
  
+<<<<<<< CHANGES.txt
+        - Collector #2561: XXBucket.values() returned keys instead of values   
+=======
         - Fixed the API docs for user objects.
+>>>>>>> 1.359
    
 
     Zope 2.4 beta 2