From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 30 Jan 2012 11:33:27 +0000 (+0000)
Subject: Merge remote branch 'shadowcat/master'
X-Git-Tag: 1.08~50
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2814d7c92e9eae4474459e6dffb6bfa3bd91f53d;p=catagits%2FCatalyst-Action-Serialize-Data-Serializer.git

Merge remote branch 'shadowcat/master'

* shadowcat/master:
  Fix a typo in Changes
---

2814d7c92e9eae4474459e6dffb6bfa3bd91f53d
diff --cc Changes
index c82d595,83322b9..312e10e
--- a/Changes
+++ b/Changes
@@@ -1,11 -1,8 +1,11 @@@
 +Mon  20 Jan 2012 11:22:00 GMT - Release 0.96
 +  Added fix for RT 63537 (from Gerv) and tests to check it.
 +
  Wed  04 Jan 2012 19:34:00 GMT - Release 0.95
-   Fix regex for JSONP parameter name to be able to include the . chatacter
+   Fix regex for JSONP parameter name to be able to include the . character
    in Catalyst::Action::Serialize::JSONP. RT#73741
  
 -  Add optional location parameter to status_acceped handler. RT#73691 (ghenry)
 +  Add optional location parameter to status_accepted handler. RT#73691 (ghenry)
  
  Fri  09 Dec 2011 08:35:00 GMT - Release 0.94
    Add 403 Forbidden and 302 Not Found status methods to