summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-10 13:55:57 -0500
committerChris McDonough <chrism@plope.com>2011-12-10 13:55:57 -0500
commit5c8251d91d00bcba9f8f66df892bac47dd73c719 (patch)
treeed6e213a674d3d4e138d63be91c2c00317b221eb /CHANGES.txt
parent0115f3cee78c3b99e517b89ea288b4f6f3213a68 (diff)
parentd587b4b6974c2e4a9074f5bde42095227acfdd1c (diff)
downloadpyramid-5c8251d91d00bcba9f8f66df892bac47dd73c719.tar.gz
pyramid-5c8251d91d00bcba9f8f66df892bac47dd73c719.tar.bz2
pyramid-5c8251d91d00bcba9f8f66df892bac47dd73c719.zip
merge 1.3-branch back to master
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 4be846ece..9cdaac5be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.3a1 (2011-12-09)
+==================
Features
--------