From ee885af6294c6635a16ed4387d41d0561798cfd3 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 17 Aug 2011 19:02:02 +0200
Subject: [PATCH] prep for 1.1.2

---
 docs/conf.py |    2 +-
 setup.py     |    2 +-
 CHANGES.txt  |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d88c16b..d34a238 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1.2 (2011-08-17)
+==================
 
 Bug Fixes
 ---------
diff --git a/docs/conf.py b/docs/conf.py
index 66f1625..df008ba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.1.1'
+version = '1.1.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 59056d2..66d9e9b 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@
     install_requires.append('simplejson')
     
 setup(name='pyramid',
-      version='1.1.1',
+      version='1.1.2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,

--
Gitblit v1.9.3