Merge branch 'master' into python3

zopefoundation · Feb 13, 2014 · 914580f · 914580f
2 parents ccd5138 + 92c90e1
commit 914580f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,9 @@
 Changes
 *******
 
+1.2.0 (2014-02-04)
+==================
+
 - Added an ``on-change`` option to the configuration recipe to run a
   command when a configuration file changes.
 

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@ def read(*rnames):
 
 setup(
     name = name,
-    version='1.1.0',
+    version='1.2.0',
     author = 'Jim Fulton',
     author_email = 'jim@zope.com',
     description = 'ZC Buildout recipe for Unix deployments',