summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-09-22 14:13:09 -0400
committerChris McDonough <chrism@plope.com>2013-09-22 14:13:09 -0400
commit00c590bd7425565221f44b5f0e6eafe3e1fbd4b8 (patch)
tree3c5b3af930babdaecad22e5bd006ee4d4f77cfe2 /CHANGES.txt
parentc61f4665dff59c3ed1ab342a7805e5d4524877b3 (diff)
parent78b41e570f69f054a51cd3f32432b92b261ed268 (diff)
downloadpyramid-00c590bd7425565221f44b5f0e6eafe3e1fbd4b8.tar.gz
pyramid-00c590bd7425565221f44b5f0e6eafe3e1fbd4b8.tar.bz2
pyramid-00c590bd7425565221f44b5f0e6eafe3e1fbd4b8.zip
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index add6df7bd..8295a98c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next Release
-============
+1.5a2 (2013-09-22)
+==================
Features
--------