From: Daniel Ruggeri <druggeri@apache.org>
Date: Sat, 31 Dec 2016 13:42:52 +0000 (+0000)
Subject: Update proposal with reference to trunk commit
X-Git-Tag: 2.4.26~406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3930a0a11e69c191f63dfcf5264635b828d0a156;p=apache

Update proposal with reference to trunk commit

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

diff --git a/STATUS b/STATUS
index 967cc4f052..30ef91112a 100644
--- a/STATUS
+++ b/STATUS
@@ -163,6 +163,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1776575
                   http://svn.apache.org/r1776578 (doc fix)
                   http://svn.apache.org/r1776627 (shortened name + doc fix)
+                  http://svn.apache.org/r1776674 (attribution moved to CHANGES)
+                  http://svn.apache.org/r1776740 (attribution updated in mod_remotip.c)
      2.4 patch (includes CHANGES):
                   http://people.apache.org/~druggeri/patches/RemoteIPProxyProtocol.2.4.x.patch
      +1: druggeri