From: Paul J. Reder <rederpj@apache.org>
Date: Thu, 5 Feb 2004 03:28:58 +0000 (+0000)
Subject: Re-synch with 2.0 stable branch after backport.
X-Git-Tag: pre_ajp_proxy~733
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d9f84e1dcbddbb5fd4479cc7ecb6a5570340010;p=apache

Re-synch with 2.0 stable branch after backport.


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

diff --git a/CHANGES b/CHANGES
index d05a1f6810..0c83eb222c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -268,6 +268,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) ap_mpm.h: Fix include guard of ap_mpm.h to reference mpm
+     instead of mmn. [André Malo]
+
   *) mod_rewrite: Catch an edge case, where strange subsequent RewriteRules
      could lead to a 400 (Bad Request) response.  [André Malo]