1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a49b689e14..879d05c489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/encoding.rb (encoding=): give priority to particular
+	  conversion to iconv.  [ruby-core:06520]
+
 Fri Dec  9 23:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* range.c (range_include): return false unless included in numeric