Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2014-01-22 6a7cf709e1ce42469ff61b28832905aec6a7100c

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