1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 407aaa6d17..e10c94034d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  7 13:07:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/forwardable.rd: Remove stale documentation file
+	* lib/forwardable.rb: Merge documentation from doc/forwardable.rd
+
 Fri Dec  7 09:47:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* time.c (time_mdump): dump timezone string to private instance variable