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

[Jan-Wijbrand Kolman]

Log message for revision 117518:
  Preparing release 1.2

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

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2010-10-13 15:54:52 UTC (rev 117517)
+++ grok/trunk/CHANGES.txt	2010-10-13 16:07:16 UTC (rev 117518)
@@ -1,8 +1,8 @@
 Grok changes
 ************
 
-1.2b (unreleased)
-=================
+1.2 (2010-10-13)
+================
 
 - Nothing changed yet.
 

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2010-10-13 15:54:52 UTC (rev 117517)
+++ grok/trunk/setup.py	2010-10-13 16:07:16 UTC (rev 117518)
@@ -21,7 +21,7 @@
 
 setup(
     name='grok',
-    version='1.2bdev',
+    version = '1.2',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',