[Checkins] SVN: grok/branches/1.1/ Back to development: 1.2

[Jan-Wijbrand Kolman]

Log message for revision 112473:
  Back to development: 1.2

Changed:
  U   grok/branches/1.1/CHANGES.txt
  U   grok/branches/1.1/setup.py

-=-
Modified: grok/branches/1.1/CHANGES.txt
===================================================================
--- grok/branches/1.1/CHANGES.txt	2010-05-18 18:47:28 UTC (rev 112472)
+++ grok/branches/1.1/CHANGES.txt	2010-05-18 18:48:18 UTC (rev 112473)
@@ -1,6 +1,12 @@
 Grok changes
 ************
 
+1.2 (unreleased)
+================
+
+- Nothing changed yet.
+
+
 1.1 (2010-05-18)
 ================
 

Modified: grok/branches/1.1/setup.py
===================================================================
--- grok/branches/1.1/setup.py	2010-05-18 18:47:28 UTC (rev 112472)
+++ grok/branches/1.1/setup.py	2010-05-18 18:48:18 UTC (rev 112473)
@@ -22,7 +22,7 @@
 
 setup(
     name='grok',
-    version='1.1',
+    version='1.2dev',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',