Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2013-11-25 5b5f7c5ea79c0c9efcb4ecae4bdf1224e8486833

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