From 2db4ac6e2bdae58574438fc3081d5f1fda7fa430 Mon Sep 17 00:00:00 2001
From: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 7 Dec 2012 04:21:20 +0000
Subject: Commit ChangeLog from r38249

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

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
-- 
cgit v1.2.3