[Checkins] SVN: grok/trunk/ Preparing release 1.2.1

[Jan-Wijbrand Kolman]

Log message for revision 117916:
  Preparing release 1.2.1

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

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2010-10-26 14:41:19 UTC (rev 117915)
+++ grok/trunk/CHANGES.txt	2010-10-26 14:41:35 UTC (rev 117916)
@@ -1,7 +1,7 @@
 Grok changes
 ************
 
-1.2.1 (unreleased)
+1.2.1 (2010-10-26)
 ==================
 
 - Grok tutorial example projects updated.

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2010-10-26 14:41:19 UTC (rev 117915)
+++ grok/trunk/setup.py	2010-10-26 14:41:35 UTC (rev 117916)
@@ -21,7 +21,7 @@
 
 setup(
     name='grok',
-    version = '1.3dev',
+    version='1.2.1',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',