Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Till Brehm

2015-09-18 c108c22cb139b55e3adb7e563ab640c4dc8d2305

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';