Merge branch 'stable-3.1'

Marius Burkard

2016-01-18 b6a0ab059e67975984633b1a99446818b3e9ee59

 server/conf/nginx_vhost.conf.master

@@ -112,7 +112,7 @@
        access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined;

        ## Disable .htaccess and other hidden files
        location ~ /\. {
        location ~ /\.(?!well-known/acme-challenge/) {
            deny all;
            access_log off;
            log_not_found off;