[Zope-Checkins] SVN: Zope/trunk/ Merged c119450 from 2.13 branch

[Hanno Schlichting]

Log message for revision 119451:
  Merged c119450 from 2.13 branch
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/setup.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2011-01-07 21:14:48 UTC (rev 119450)
+++ Zope/trunk/doc/CHANGES.rst	2011-01-07 21:15:56 UTC (rev 119451)
@@ -31,6 +31,9 @@
 
 - Updated to Zope Toolkit 1.1dev.
 
+- Added `addzope2user` script, suitable for adding an admin user directly to
+  the root acl_users folder.
+
 - Updated distributions:
 
   - Products.ZCatalog = 2.13.3

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2011-01-07 21:14:48 UTC (rev 119450)
+++ Zope/trunk/setup.py	2011-01-07 21:15:56 UTC (rev 119451)
@@ -118,6 +118,7 @@
           'runzope=Zope2.Startup.run:run',
           'zopectl=Zope2.Startup.zopectl:run',
           'zpasswd=Zope2.utilities.zpasswd:main',
+          'addzope2user=Zope2.utilities.adduser:main',
       ],
     },
 )