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

Marius Cramer

2013-11-21 1324b80369489bcf29c70c379e7bce49737f3db4

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