Merge branch 'stable-3.0.5' into 'master'

Marius Cramer

2014-02-25 230339ed643ed504f42660ca0541f5af85c5a684

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