1 files changed, 4 insertions, 0 deletions
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: