From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 13 Nov 2013 02:58:40 +0000 (+0000)
Subject: Sync proposed patch and trunk/
X-Git-Tag: 2.4.7~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff3446f5fce564e369ecf1d399fd86304ddeb5db;p=apache

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
---

diff --git a/STATUS b/STATUS
index 25fd7f4877..2ad4a9b2b4 100644
--- 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: