[Checkins] SVN: grok/trunk/ Back to development: 1.2.2

[Jan-Wijbrand Kolman]

Log message for revision 117918:
  Back to development: 1.2.2

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:54 UTC (rev 117917)
+++ grok/trunk/CHANGES.txt	2010-10-26 14:43:54 UTC (rev 117918)
@@ -1,6 +1,12 @@
 Grok changes
 ************
 
+1.2.2 (unreleased)
+==================
+
+- Nothing changed yet.
+
+
 1.2.1 (2010-10-26)
 ==================
 

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2010-10-26 14:41:54 UTC (rev 117917)
+++ grok/trunk/setup.py	2010-10-26 14:43:54 UTC (rev 117918)
@@ -21,7 +21,7 @@
 
 setup(
     name='grok',
-    version='1.2.1',
+    version='1.2.2dev',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',