From f1e90ca3e09f991aa5c4bc64a698fe6973dfa252 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Sat, 24 Mar 2012 16:35:06 +0000
Subject: [PATCH] propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1304853 13f79535-47bb-0310-9956-ffa450edef68
---
 STATUS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/STATUS b/STATUS
index 5e390000b1..7cdf3efa7b 100644
--- a/STATUS
+++ b/STATUS
@@ -134,6 +134,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch:  http://people.apache.org/~covener/patches/httpd-2.4.x-proxy_reverse.diff
     +1: 
 
+  * core: Fix merging of AllowOverrideList and ContentDigest.
+    Trunk patch: http://svn.apache.org/viewvc?rev=1304852&view=rev
+    2.4.x patch: Trunk patch works
+    +1: sf
+
 PATCHES/ISSUES THAT ARE STALLED
 
 
-- 
2.40.0