Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-20 0832c839f8141f9f52ce3328db3da2607a394eae

 server/conf/apache_ispconfig.conf.master

@@ -104,7 +104,9 @@
      </tmpl_if>
</Directory>

<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>

NameVirtualHost *:80
NameVirtualHost *:443