[Zope-Checkins] SVN: Zope/trunk/ Merged c105358 from 2.12 branch

[Hanno Schlichting]

Log message for revision 105360:
  Merged c105358 from 2.12 branch
  

Changed:
  _U  Zope/trunk/include/
  U   Zope/trunk/versions.cfg

-=-

Property changes on: Zope/trunk/include
___________________________________________________________________
Modified: svn:externals
   - Acquisition     svn://svn.zope.org/repos/main/Acquisition/tags/2.12.2/src/Acquisition
ExtensionClass  svn://svn.zope.org/repos/main/ExtensionClass/tags/2.11.3/src/ExtensionClass
persistent      svn://svn.zope.org/repos/main/ZODB/tags/3.9.0b4/src/persistent

   + Acquisition     svn://svn.zope.org/repos/main/Acquisition/tags/2.12.4/src/Acquisition
ExtensionClass  svn://svn.zope.org/repos/main/ExtensionClass/tags/2.11.3/src/ExtensionClass
persistent      svn://svn.zope.org/repos/main/ZODB/tags/3.9.0b4/src/persistent


Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg	2009-10-29 10:23:45 UTC (rev 105359)
+++ Zope/trunk/versions.cfg	2009-10-29 10:26:07 UTC (rev 105360)
@@ -3,7 +3,7 @@
 versions = versions
 
 [versions]
-Acquisition = 2.12.3
+Acquisition = 2.12.4
 DateTime = 2.12.0
 ExtensionClass = 2.11.3
 Persistence = 2.11.1