Sync proposed patch and trunk/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1541370 13f79535-47bb-0310-9956-ffa450edef68
git-mirror · Nov 13, 2013 · a361d70 · a361d70
1 parent 8905cc6
commit a361d70
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/STATUS b/STATUS
@@ -215,6 +215,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1524192
                  https://svn.apache.org/viewvc?view=revision&revision=1524770
                  https://svn.apache.org/viewvc?view=revision&revision=1527925
+                 https://svn.apache.org/viewvc?view=revision&revision=1541270
+                 https://svn.apache.org/viewvc?view=revision&revision=1541368
     2.4.x patch (plus CHANGES entry above):
         http://people.apache.org/~wrowe/httpd-2.4-r1524192-r1524770-TE-CL.patch
     +1: