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

Jan-Claas Dirks

2015-09-24 6fe4103fcb9f28ca1382218e0f1c52dbb89cb43d

1
2
ALTER TABLE `web_domain` ADD `seo_redirect` VARCHAR( 255 ) default NULL AFTER `redirect_path`;
ALTER TABLE `web_folder_user` ADD `server_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `sys_perm_other`;