*** empty log message ***

doc/CHANGES.txt

@@ -18,6 +18,8 @@ Zope Changes
           There is now a "properties" tab in user folders where you
           can select whether passwords are stored encrypted.
 
+        - Locale support in STXNG has been broken (since 2.4.0)
+
 
     Bugs fixed
 
@@ -83,7 +85,11 @@ Zope Changes
           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