summaryrefslogtreecommitdiff
path: root/CHANGELOG.rdoc
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG.rdoc')
-rw-r--r--CHANGELOG.rdoc6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 1962785..c48b7aa 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,9 @@
+Sat Apr 7 02:07:00 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/parser.c: fall back to any encoding if the external
+ encoding is wrong. [ruby-core:44163]
+ * test/psych/test_encoding.rb: fix test
+
Fri Mar 9 06:29:22 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych.rb (load, parse): stop parsing or loading after