Merge branch 'stable-3.0.5'

Marius Cramer

2014-10-24 5ec4395f0e23bf11b3edef5c745e8f38c73ce637

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