From 75ef9e79d6f872d9155cfa69d717b0c693be7fc9 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 Apr 2010 05:08:28 +0000
Subject: Import RDoc 2.5.4

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 524a84c908..60aaa33ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 19 13:58:04 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 2.5.4.  Fixes #3169, #3160, #3023.
+
 Mon Apr 19 12:46:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/timeout.rb (Timeout#timeout): propagate errors to the
-- 
cgit v1.2.3