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

[Hanno Schlichting]

Log message for revision 110505:
  Merged r110504 from 2.12 branch
  

Changed:
  U   Zope/trunk/buildout.cfg
  U   Zope/trunk/setup.py
  D   Zope/trunk/src/ZopeUndo/
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/buildout.cfg
===================================================================
--- Zope/trunk/buildout.cfg	2010-04-05 17:15:37 UTC (rev 110504)
+++ Zope/trunk/buildout.cfg	2010-04-05 17:18:53 UTC (rev 110505)
@@ -45,6 +45,7 @@
     ThreadLock
     initgroups
     tempstorage
+    ZopeUndo
     zope.browser
     zope.browsermenu
     zope.browserpage

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2010-04-05 17:15:37 UTC (rev 110504)
+++ Zope/trunk/setup.py	2010-04-05 17:18:53 UTC (rev 110505)
@@ -70,6 +70,7 @@
       'ThreadLock',
       'ZConfig',
       'ZODB3',
+      'ZopeUndo',
       'docutils',
       'initgroups',
       'pytz',

Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg	2010-04-05 17:15:37 UTC (rev 110504)
+++ Zope/trunk/versions.cfg	2010-04-05 17:18:53 UTC (rev 110505)
@@ -33,6 +33,7 @@
 ZConfig = 2.7.1
 zdaemon = 2.0.4
 ZODB3 = 3.9.4
+ZopeUndo = 2.12.0
 zope.annotation = 3.5.0
 zope.broken = 3.6.0
 zope.browser = 1.2