Merge branch 'custom_tranport_fix' into 'master'

Marius Cramer

2014-08-22 a7f96ca5a97506e5a14265876660a5b25e9ed025

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