Merge remote-tracking branch 'renky/master_fixes'

Marius Cramer

2014-04-10 7e886ae640ca6b38b332f139427d69ae50cca352

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