From b769cc8edfc8503055f3b3b5b86b7076e939ad4e Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 11 Mar 2014 15:01:38 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 server/conf/apache_ispconfig.conf.master |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index f9062f5..6873e53 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -9,7 +9,7 @@
 <Directory /var/www/clients>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -20,7 +20,7 @@
 <Directory />
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -30,7 +30,7 @@
 <Directory /var/www/conf>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all

--
Gitblit v1.9.1