1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 38950333c1..1bb9d1f085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May  1 16:50:05 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#merge): Only directly use the passed objects
+	  @hash instance variable when self and the passed object are
+	  instances of the same class. [Bug #118]
+
 Fri May  1 16:44:11 2009  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (SortedSet#add): Do not let an uncomparable object