promote 2 backports

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

diff --git a/STATUS b/STATUS
index 6fa66e478ebfb6f4ba9206954a2b117a1f5e43ce..56317e3846cc7c889900b242dec0fc36fc62e49b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,12 +89,7 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
- * mod_xml2enc: Fix handling of EOS buckets.
+* mod_xml2enc: Fix handling of EOS buckets.
    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1293717
    2.4.x patch: Trunk patch works, needs CHANGES entry:
      mod_xml2enc: Fix broken handling of EOS buckets which could lead to
@@ -106,7 +101,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.4.x patch: Trunk patch works
    +1: sf, covener, jim
 
- * mod_slotmem_shm: Support DEFAULT_REL_RUNTIMEDIR for file-based shm.
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+  * mod_slotmem_shm: Support DEFAULT_REL_RUNTIMEDIR for file-based shm.
    Trunk patch: http://svn.apache.org/viewvc?rev=1297560&view=rev
    2.4.x patch: Trunk patch works
    +1:  jim