From 876fb62b301f321ff08c0f2e4e99372c9ce4a839 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 11 Oct 2011 07:45:13 -0400
Subject: garden

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 9859fbf14..79ce21e00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,10 @@ Bug Fixes
 - The ``pryamid.view.view_config`` decorator did not accept a ``match_params``
   predicate argument.  See https://github.com/Pylons/pyramid/pull/308
 
+- The AuthTktCookieHelper could potentially generate Unicode headers
+  inappropriately when the ``tokens`` argument to remember was used.  See 
+  https://github.com/Pylons/pyramid/pull/314.
+
 Backwards Incompatibilities
 ---------------------------
 
-- 
cgit v1.2.3