From 75a8ff4ad0ba8eed13592eb5e7a211da3035e209 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 23 Aug 2012 10:53:04 -0500
Subject: updated CHANGES with accept-header bug fix

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

diff --git a/CHANGES.txt b/CHANGES.txt
index b8747f06c..e799c8f00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,11 @@ Bug Fixes
   when mixing up inheritance with asset specs.
   https://github.com/Pylons/pyramid/issues/662
 
+- HTTP Accept headers were not being normalized causing potentially
+  conflicting view registrations to go unnoticed. Two views that only
+  differ in the case ('text/html' vs. 'text/HTML') will now raise an error.
+  https://github.com/Pylons/pyramid/pull/620
+
 Features
 --------
 
-- 
cgit v1.2.3