Branch '2.3-stable' - apache/apache.patch

[Christoph Wickert]

 apache/apache.patch |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit 37010681a97f0bea44fd60583571fb0c65ffd152
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 13 12:42:16 2011 +0200

    apache: Fix apache.patch, mime.types part is upstream in 2.2.20

diff --git a/apache/apache.patch b/apache/apache.patch
index d8c22d3..1caacf0 100644
--- a/apache/apache.patch
+++ b/apache/apache.patch
@@ -49,17 +49,6 @@ Index: configure
  # Catch some misconfigurations:
  case ${apr_found}.${apu_found} in
  reconfig.yes)
-Index: docs/conf/mime.types
---- docs/conf/mime.types.orig	2010-01-06 00:40:54.000000000 +0100
-+++ docs/conf/mime.types	2010-03-06 09:25:36.000000000 +0100
-@@ -103,6 +103,7 @@
- application/mbox				mbox
- # application/media_control+xml
- application/mediaservercontrol+xml		mscml
-+application/metalink+xml			metalink
- # application/mikey
- # application/moss-keys
- # application/moss-signature
 Index: docs/docroot/index.html
 --- docs/docroot/index.html.orig	2004-11-20 21:16:24.000000000 +0100
 +++ docs/docroot/index.html	2010-03-06 09:23:16.000000000 +0100