From: Jeff Trawick <trawick@apache.org>
Date: Fri, 5 Dec 2003 21:22:30 +0000 (+0000)
Subject: suggest another merge
X-Git-Tag: 2.0.49~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb7065cb73e4e959a051693aa60f45bf8c899946;p=thirdparty%2Fapache%2Fhttpd.git

suggest another merge


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

diff --git a/STATUS b/STATUS
index f76528d1cd9..dd762fc4997 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/04 16:06:55 $]
+Last modified at [$Date: 2003/12/05 21:22:30 $]
 
 Release:
 
@@ -359,6 +359,13 @@ PATCHES TO BACKPORT FROM 2.1
         modules/generators/mod_cgid.c r1.159
       +1: trawick
 
+    * mod_status hook
+        configure.in r1.254
+        Makefile.in r1.134
+        modules/generators/mod_status.c r1.173
+        modules/generators/mod_status.h r1.2
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,