From d5a2139dfb854cf59192dfd36e16075786b9297e Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 Jun 2006 18:24:46 +0000
Subject: Merge RDoc from HEAD

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 7c3ec4c81c..52a87fcaf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 19 11:21:46 2006  Eric Hodel <drbrain@segment7.net>
+
+	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
+
 Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb:
-- 
cgit v1.2.3