1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a9cdd0ee8..b7a328d6cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 11 22:44:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
+	  argument only if non-nil value is given.
+	  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
+	  mrkn.
+
 Mon Mar 11 19:22:54 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/mkmf/base.rb: class name conflict.