propose backport merge

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

diff --git a/STATUS b/STATUS
index 78871f47f8011a46ea54bd6687facb9fad7f97e4..780cea603bccd63040e5b18f6d7b8d72c150447a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/02/04 15:57:35 $]
+Last modified at [$Date: 2004/02/04 20:23:21 $]
 
 Release:
 
@@ -80,6 +80,10 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
+    * Fix include guard of ap_mpm.h
+        include/ap_mpm.h: r1.38
+      +1: nd
+
     * Fix file extensions for real media files and removed rpm extension
       from mime.types. PR 26079. (2.0 + 1.3)
         docs/conf/mime.types: r1.23