Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2014-01-03 c3570e5419af1f86a1662239674087988eb737c4

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