Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be mer...

tbrehm

2013-01-17 43b345cabb3e8743a91c39e8d6367c1aa594ebd2

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