Finish the merge of r683626, r685112 with a tweak to

CHANGES that was in a later revision.

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

diff --git a/CHANGES b/CHANGES
index bd0308e3a4f2b682f102fb810bcb7a84ec383d59..f1ca5016a66f530625b3d89f56b11d8152c4ea37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ Changes with Apache 2.2.10
 
   *) mod_dav_fs: Retrieve minimal system information about directory
      entries when walking a DAV fs, resolving a performance degradation on
-     Windows.  PR 45464.  [Jeff Trawick]
+     Windows.  PR 45464.  [Joe Orton, Jeff Trawick]
 
   *) mod_cgid: Pass along empty command line arguments from an ISINDEX
      query that has consecutive '+' characters in the QUERY_STRING,