Commit a78005b9 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Apply backport... fix "conflicts" with CHANGES and ap_mmn.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@595474 13f79535-47bb-0310-9956-ffa450edef68
parent da734c8a
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment