From a549793dccc43cbbd47b40fb339c1a1c37cbc6e6 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 14 Dec 2014 07:11:11 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

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

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index c563650..7805988 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -85,6 +85,7 @@
 php_ini_path_cgi=/etc/php5/cgi/php.ini
 check_apache_config=y
 enable_sni=y
+enable_spdy=n
 enable_ip_wildcard=y
 overtraffic_notify_admin=y
 overtraffic_notify_client=y

--
Gitblit v1.9.1