1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 056bb2ea76..7dd1cfe9f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Feb  3 07:02:16 2011  Aaron Patterson <[email protected]>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
+	  expressions can round trip. [ruby-core:34969]
+
+	* test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
+
+	* ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
+	  expressions can round trip.
+
+	* test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
+
 Wed Feb  2 17:09:22 2011  KOSAKI Motohiro  <[email protected]>
 
 	* io.c (rb_io_fdatasync): Use fsync(2) if if the underlying