From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

---
 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