Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable...

Marius Burkard

2016-03-02 65ee075f32c58e35d3b660006bceaad9f6a2a4d8

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