Reverted array_merge change

Marius Cramer

2013-11-21 7b35164b46ca67cd1dfa43bba583aa90106a5d8b

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