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

Marius Cramer

2013-12-18 5a234a89193bcaaf5b3f7dc1a99bb6c1b10c9df3

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`;