Merge remote-tracking branch 'ispc3master/master' into vhostalias

Dominik

2014-01-23 2d7d9eaa5acda62f1580bc09304ce85a7f7cea9f

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