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

Marius Cramer

2014-04-04 36420c614b259a0ca1aa7db14b1215db60c4c5ce

 server/conf/apache_ispconfig.conf.master

@@ -56,6 +56,15 @@
      </tmpl_if>
</Directory>

<Directory /srv/www/htdocs>
      <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
      Require all granted
      <tmpl_else>
        Order allow,deny
        Allow from all
      </tmpl_if>
</Directory>

<Directory /usr/share/squirrelmail>
      <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
      Require all granted