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

Florian Schaal

2014-01-04 8edb9c1a3051e03c25eef886171ec9de9c5c3dec

1
2
ALTER TABLE `dns_slave` DROP INDEX `origin`;
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);