From 64223904fd6330eb9e528311799cc4dd10e9daf1 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@digitalartefacts.com>
Date: Tue, 22 Oct 2013 22:11:13 -0500
Subject: update changelog

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 203db1a44..895dc572f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -57,6 +57,10 @@ Bug Fixes
   to decode with UTF-8 first, and will fallback to Latin-1.
   See https://github.com/Pylons/pyramid/pull/1170
 
+- The ``@view_defaults`` now apply to notfound and forbidden views
+  that are defined as methods of a decorated class.
+  See https://github.com/Pylons/pyramid/issues/1173
+
 Documentation
 -------------
 
-- 
cgit v1.2.3