From 2d659e41d01926acaa8670c4d20be20300bcedb7 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 5 Jan 2015 23:25:58 -0600
Subject: update changes for #1417

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 129ce4616..150ca85b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -64,6 +64,10 @@ Features
   a factory that will return a custom ``Response`` class.
   See https://github.com/Pylons/pyramid/pull/1499
 
+- Allow an iterator to be returned from a renderer. Previously it was only
+  possible to return bytes or unicode.
+  See https://github.com/Pylons/pyramid/pull/1417
+
 Bug Fixes
 ---------
 
-- 
cgit v1.2.3