1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d44d5c6c23..7e067a64ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan 30 07:00:16 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* object.c: Improve error for failed implicit conversions [Bug #7539]
+
+	* error.c: Adapt rdoc
+
+	* test/ruby/test_object.rb: Test for above
+
 Tue Jan 29 21:40:12 2013  Tanaka Akira  <akr@fsij.org>
 
 	* lib/net/http/generic_request.rb (encode_multipart_form_data): remove