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

Dominik

2015-01-29 4452e73b4867aa7fd49d5066937ebcc0bc84b3d6

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