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

[Matt Behrens]

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

Modified Files:
	CHANGES.txt 
Log Message:
Collector #17: Fix broken links in StandardCacheManagers help.

Also remove conflict cruft that snuck into CHANGES.txt.



=== Zope/doc/CHANGES.txt 1.441 => 1.442 ===
         headers, causing Connection:Close requests to stall
 
->>>>>>> 1.440
+      - Collector #17: Fixed broken links in StandardCacheManagers help
+
   Zope 2.5.1 beta 1
     
     Bugs Fixed