From 63f65dbfcb5e7ef7864f8a954849597ba07a0299 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 12 Sep 2011 23:16:37 -0400
Subject: prep for 1.2

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

diff --git a/CHANGES.txt b/CHANGES.txt
index ac3b9aafc..21ea2bb4a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2 (2011-09-12)
+================
 
 Features
 --------
diff --git a/docs/conf.py b/docs/conf.py
index a35dfcfe8..71c4f58d4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.2b3'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 86d3df9a5..0a5b0fb9a 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6):
     install_requires.append('simplejson')
     
 setup(name='pyramid',
-      version='1.2b3',
+      version='1.2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3