From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 03 Jan 2013 06:51:45 -0500
Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch.

---
 install/tpl/server.ini.master |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 9b55ef7..4dae4f6 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -44,7 +44,6 @@
 website_path=/var/www/clients/client[client_id]/web[website_id]
 website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/
 website_symlinks_rel=n
-vhost_rewrite_v6=n
 vhost_conf_dir=/etc/apache2/sites-available
 vhost_conf_enabled_dir=/etc/apache2/sites-enabled
 nginx_vhost_conf_dir=/etc/nginx/sites-available

--
Gitblit v1.9.1