Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-11-14 b7ce7d4c816fe48ef649351265fe6485da3c2362

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