From: Rainer Jung <rjung@apache.org>
Date: Mon, 18 Feb 2013 22:10:06 +0000 (+0000)
Subject: Fix typo.
X-Git-Tag: 2.2.24~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4276ab4452b3b5965f7f7fa2a57d5d87d874e2a;p=thirdparty%2Fapache%2Fhttpd.git

Fix typo.


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

diff --git a/CHANGES b/CHANGES
index 17bb152fcf3..e8dd9ef8135 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@ Changes with Apache 2.2.24
      XSS in mod_proxy_balancer manager interface. [Jim Jagielski,
      Niels Heinen <heinenn google com>]
 
-  *) mod_rewrite: Stop mergeing RewriteBase down to subdirectories
+  *) mod_rewrite: Stop merging RewriteBase down to subdirectories
      unless new option 'RewriteOptions MergeBase' is configured.
      Merging RewriteBase was unconditionally turned on in 2.2.23.
      PR 53963. [Eric Covener]