Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-07-20 f4719e1b4419a5ccbcdafe7c717c7d78c4b366ae

1
2
3
4
5
6
7
#!/bin/bash
 
php -q \
    -d disable_classes= \
    -d disable_functions= \
    -d open_basedir= \
    /usr/local/ispconfig/server/scripts/ispconfig_update.php