From 85f950cf2ca1f9fcc3e070fb3a39c7285a62134b Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sat, 17 May 2014 04:55:33 +0200
Subject: [PATCH] update changelog

---
 CHANGES.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0d77712..dd356cd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,9 @@
 - Removed non-ascii copyright symbol from templates, as this was
   causing the scaffolds to fail for project generation.
 
+- Fix an issue where a ``pyramid.response.FileResponse`` may apply a charset
+  where it does not belong. See https://github.com/Pylons/pyramid/pull/1251
+
 1.5 (2014-04-08)
 ================
 

--
Gitblit v1.9.3