Permalink
Browse files

Merge branch '1.4-branch'

  • Loading branch information...
2 parents ecc2bd2 + e609e19 commit 60eb090f768f48ff70b38e1846b0a6612e597f5a @mcdonc mcdonc committed Dec 11, 2012
Showing with 8 additions and 2 deletions.
  1. +6 −0 CHANGES.txt
  2. +1 −1 docs/conf.py
  3. +1 −1 setup.py
View
@@ -1,3 +1,9 @@
+1.4b3 (2012-12-10)
+==================
+
+- Packaging release only, no code changes. 1.4b2 was a brownbag release due to
+ missing directories in the tarball.
+
1.4b2 (2012-12-10)
==================
View
@@ -81,7 +81,7 @@ def nothing(*arg):
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4b2'
+version = '1.4b3'
# The full version, including alpha/beta/rc tags.
release = version
View
@@ -68,7 +68,7 @@
]
setup(name='pyramid',
- version='1.4b2',
+ version='1.4b3',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,

0 comments on commit 60eb090

Please sign in to comment.