From 05fd08652293809fc6fd344cd1d4fe3a90cc2201 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 23 Jun 2011 15:47:13 -0400
Subject: garden

---
 CHANGES.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'CHANGES.txt')

diff --git a/CHANGES.txt b/CHANGES.txt
index 0bb15c35b..3c1d16fa5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,14 @@
+Next release
+============
+
+Bug fixes
+---------
+
+- Pyramid would raise an AttributeError in the Configurator when attempting
+  to set a ``__text__`` attribute on a custom predicate that was actually a
+  classmethod.  See https://github.com/Pylons/pyramid/pull/217 .
+
+
 1.1a2 (2011-06-22)
 ==================
 
-- 
cgit v1.2.3