From 7376af3092722b2d4c16e236b3cd530c3de07543 Mon Sep 17 00:00:00 2001
From: gsinclair <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Feb 2004 10:42:39 +0000
Subject: [PATCH] Retrofit entry (there was conflict):   From ruby_1_8 branch: 
  * lib/test/unit.rb: rearranged documentation for RDoc's sake.   *
 lib/matrix.rb: improved documentation.   * lib/net/http.rb: slight
 documentation formatting improvement.

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

diff --git a/ChangeLog b/ChangeLog
index ac0847a0b9..9e82e0b234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,13 @@ Sun Feb  1 23:00:00 2004  Shigeo Kobayashi <shigek@ruby-lang.org>
 	* ext/bigdecimal.c: Bug in BigDecimal("1e#{n}").add BigDecimal('.5'),n)
 	  reported and fixed by Javier Goizueta.
 
+Sun Feb  1 18:21:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
+
+	From ruby_1_8 branch:
+	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
+	* lib/matrix.rb: improved documentation.
+	* lib/net/http.rb: slight documentation formatting improvement.
+
 Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.