1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b5094d169..bb8cf91eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 15:20:34 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/context.rb:  Don't warn for duplicate methods while loading.
+	* test/rdoc/test_rdoc_context.rb:  Test for above.
+
 Thu Dec  6 14:26:22 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems/command_manager.rb:  Removed string concatenation