[Checkins] SVN: grokproject/trunk/ Preparing release 2.6

[Jan-Wijbrand Kolman]

Log message for revision 121816:
  Preparing release 2.6

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/setup.py

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2011-05-26 11:19:32 UTC (rev 121815)
+++ grokproject/trunk/CHANGES.txt	2011-05-26 11:20:18 UTC (rev 121816)
@@ -1,7 +1,7 @@
 Changes
 =======
 
-2.6 (unreleased)
+2.6 (2011-05-26)
 ----------------
 
 - There was an inconsistency where the various logfiles we placed. Fixed the
@@ -12,7 +12,7 @@
   existing project by replacing your ``buildout.cfg`` with that of a newly
   generated project, please make sure there is no important data ``data`` and
   ``log`` subdirectories left!
-s
+
 2.5 (2011-02-02)
 ----------------
 

Modified: grokproject/trunk/setup.py
===================================================================
--- grokproject/trunk/setup.py	2011-05-26 11:19:32 UTC (rev 121815)
+++ grokproject/trunk/setup.py	2011-05-26 11:20:18 UTC (rev 121816)
@@ -25,7 +25,7 @@
 
 setup(
     name='grokproject',
-    version='2.6dev',
+    version='2.6',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',