From: John Napiorkowski <jjnapiork@cpan.org>
Date: Wed, 29 Oct 2014 15:53:02 +0000 (-0500)
Subject: updated changes
X-Git-Tag: v0.33^0
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Static-Simple.git;a=commitdiff_plain;h=338b7e9c68726a0875047dafa86d7de9c94705d8

updated changes
---

diff --git a/Changes b/Changes
index 03c9bc3..319147f 100755
--- a/Changes
+++ b/Changes
@@ -1,7 +1,9 @@
 Revision history for Perl extension Catalyst::Plugin::Static::Simple
 
 0.33   2014-09-26 17:00 BST
-       - Fixed merging of deprecated 'static' config and new one
+       - In the case where someone is trying to merge configurations
+       and some config sets use the depracated 'static' keyword, the
+       configs will be properly merged.
 
 0.32   2014-06-04 17:00 EDT
         - Sets 'autoflush' in the Catalyst Log object to false if