yet another merge

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103183 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index a8c13d564aaaab93328c673b09d607335d3f2c3a..9e15e5127c25616cab2eec6d4cf8fe312488a742 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/28 18:44:48 $]
+Last modified at [$Date: 2004/03/29 02:37:57 $]
 
 Release:
 
@@ -289,6 +289,10 @@ PATCHES TO BACKPORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.269&r2=1.270
       +1: trawick
 
+    * Don't include newlines in strings passed to ap_log_error.
+      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/main.c?r1=1.155&r2=1.156
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,