Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 install/tpl/nginx_apps.vhost.master

@@ -1,6 +1,6 @@
server {
        listen {apps_vhost_ip};
        listen [::]:{apps_vhost_port};
        listen {apps_vhost_port};
        listen [::]:{apps_vhost_port} ipv6only=on;
        ssl {ssl_on};
        {ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
        {ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;