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

Jan-Claas Dirks

2015-09-24 6fe4103fcb9f28ca1382218e0f1c52dbb89cb43d

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