vote+promote

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

diff --git a/STATUS b/STATUS
index 5cbe5c7ff5284f5613cc442bf27b9fc992b0886d..462d9b727237a140e5f5539b1f10ef2b390dc8b8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -100,6 +100,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works (minus CHANGES and ap_mmn.h):
      +1: jim, covener, sf
 
+   * mod_dir: Support for the 'disabled' FallbackResource argument
+     trunk patch : https://svn.apache.org/viewvc?view=revision&revision=1398066
+     2.4.x src patch: trunk patch works
+     documentation patch : http://apache-doc-fr.gryzor.com/fallbackresource_disabled_2.4_doc.patch
+     +1: gryzor, covener, sf
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -203,12 +209,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: minfrin, jim
 
-   * mod_dir: Support for the 'disabled' FallbackResource argument
-     trunk patch : https://svn.apache.org/viewvc?view=revision&revision=1398066
-     2.4.x src patch: trunk patch works
-     documentation patch : http://apache-doc-fr.gryzor.com/fallbackresource_disabled_2.4_doc.patch
-     +1: gryzor, covener
-
    * mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.
      PR 40841.
      trunk patch: http://svn.apache.org/viewvc?rev=1404625&view=rev