1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d8e5d0c6a..a28f941a9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Aug 28 15:38:17 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* backport r33106 from trunk.
+
+	* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
+	  stored in variable while the contents buffer is beeing used.
+
+	* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
+	  memory read. [ruby-dev:44409] [Bug #5213]
+
 Sun Aug 28 05:29:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
 
 	* backport r33102 from trunk.