From 676797ef9363acec904e6c294340083d061fea69 Mon Sep 17 00:00:00 2001
From: Alexis Sukrieh <alexis@weborama.com>
Date: Tue, 1 Mar 2011 18:20:40 +0100
Subject: [PATCH] reflect CHANGES

---
 CHANGES | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 409972d4e..4fcf4f101 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,9 @@
-1.3011_01    23.02.2011
+1.3012       01.03.2011
 
     [ BUG FIXES ]
     * Fix cookies disappearing when more than one is set.
-      (Chris Andrews)
+      Complete refactoring of the cookie handling.
+      (Chris Andrews, Geistteufel)
     * Properly set the settings in Dancer::Test only after config loading.
       (Sawyer X)
     * Fix possible loss of last directory in path.
@@ -57,6 +58,29 @@
     * Add missing methods (e.g. "referer"), sorting, clean up.
       (Flavio Poletti)
 
+1.3010_01   12.02.2011
+
+    [ BUG FIXES ]
+    * GH#136: fix again Mime::Type issues in preforking environment
+      (Chris Andrews)
+    * GH#220: fix for path issues under MacOS X and Windows platforms.
+      A new function is provided by Dancer::FileUtils: path_no_verify()
+      (Rowan Thorpe)
+    * Fix for infinite loops detection in before filters
+      (Flavio Poletti)
+    
+    [ ENHANCEMENTS ]
+    * Better detection of the application layout under non-UNIX platforms.
+      (Rowan Thorpe, Alexis Sukrieh)
+
+    [ DOCUMENTATION ]
+    * Fix a typo in Dancer::Request::Upload's POD
+      (Rowan Thorpe)
+    * Better documentation for the before filters, explanations about the
+      potential infinite loops that can happen when using before filters (and 
+      what Dancer does in that case).
+      (Flavio Poletti)
+
 1.3011    14.02.2011
 
     [ BUG FIXES ]