No fear of commit-ment.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index 0d70354bd0e460a9f0976640ad7e081214d67551..0dc369f8eb8eb0047c97f78f573b9f100cd2699f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.26-dev
 
+  *) Some style changes to the code that does ProxyErrorOverride. Fixed
+     config merge behaviour. [Graham Leggett]
+
   *) Allow support programs to be compiled against a static version
      of libapr.  This allows the smaller support programs to be 
      relocated.  [Aaron Bannert <aaron@clove.org>]