From 947ae88aa6efcf62ca89415e1ccdcf77c4ec0538 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 01 Jun 2014 05:44:14 +0200
Subject: [PATCH] prep 1.5.1

---
 setup.py    |    2 +-
 CHANGES.txt |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index dd356cd..742f371 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.5.1 (2014-05-31)
+==================
 
 - Update scaffold generating machinery to return the version of pyramid and
   pyramid docs for use in scaffolds. Updated starter, alchemy and zodb
@@ -17,7 +17,7 @@
   ``package`` argument that can override this behavior as well.
 
 - Removed non-ascii copyright symbol from templates, as this was
-  causing the scaffolds to fail for project generation.
+  causing the scaffolds to fail for project generation on some systems.
 
 - Fix an issue where a ``pyramid.response.FileResponse`` may apply a charset
   where it does not belong. See https://github.com/Pylons/pyramid/pull/1251
diff --git a/setup.py b/setup.py
index ff38ef7..32ed39d 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
     ]
 
 setup(name='pyramid',
-      version='1.5',
+      version='1.5.1',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[

--
Gitblit v1.9.3