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 d05a1f6810b829c4df53c673ea191d3977a4d559..0c83eb222cd63b6513b90f4b24b4c431fba2860f 100644 (file)
--- 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]