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/vhost.conf.master |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 2e90dde..62a9199 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -2,7 +2,7 @@
 <Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
 		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
@@ -351,4 +351,4 @@
 
 <tmpl_var name='apache_directives'>
 </VirtualHost>
-</tmpl_loop>
\ No newline at end of file
+</tmpl_loop>

--
Gitblit v1.9.1