From 3f478f7b37eb314c7dba33af10e8d32d5f2fa579 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 19 Apr 2013 05:35:57 -0400
Subject: [PATCH] Merged revisions 3922-3958 from stable branch.

---
 install/tpl/apache_ispconfig.conf.master |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index f5b2a91..0745c28 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -51,4 +51,4 @@
 Alias /awstats-icon "/usr/share/awstats/icon"
 
 NameVirtualHost *:80
-NameVirtualHost *:443
\ No newline at end of file
+NameVirtualHost *:443

--
Gitblit v1.9.1