Merge branch 'stable-3.1'

Marius Burkard

2016-01-29 f611abe17c1db9d736bbfb6b12b4711c70e9e365

1
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm';