Merge branch 'stable-3.1'

Marius Burkard

2016-03-23 f964bf7e7403578e787ce5519d9e63c074967242

 server/conf/nginx_apps.vhost.master

@@ -106,7 +106,7 @@
        location /phpMyAdmin {
               rewrite ^/* /phpmyadmin last;
        }
		

        location /squirrelmail {
               root /usr/share/;
               index index.php index.html index.htm;
@@ -164,7 +164,6 @@
               fastcgi_param   CONTENT_TYPE            $content_type;
               fastcgi_param   CONTENT_LENGTH          $content_length;

               fastcgi_param   SCRIPT_FILENAME         $request_filename;
               fastcgi_param   SCRIPT_NAME             $fastcgi_script_name;
               fastcgi_param   REQUEST_URI             $request_uri;
               fastcgi_param   DOCUMENT_URI            $document_uri;
@@ -199,4 +198,4 @@
               alias /var/lib/mailman/archives/public;
               autoindex on;
        }
}
}