Merged revisions 2886-2909 from stable branch.

tbrehm

2012-01-25 355efb9a7f74a2035f595bbd0d03375710d08587

1
ALTER TABLE `web_domain` ADD `php_fpm_use_socket` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `nginx_directives`;